diff options
| author | 2012-04-25 18:06:00 -0700 | |
|---|---|---|
| committer | 2012-08-20 13:44:34 -0700 | |
| commit | 4e68bd420b6cfdbeadb5e69aa6448665b2da762b (patch) | |
| tree | 4c76067723f8a24d5d1b9f366d939a949da97419 /packages/SystemUI | |
| parent | bf5740e75efd87ae0213486e78e029403804c6f0 (diff) | |
Add UsbDebuggingManager and UsbDebuggingActivity
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.
Change-Id: I115c828331d8e326c380844ee33915d5dff22260
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java | 137 |
3 files changed, 154 insertions, 0 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e13378fac81e..2eee31d4551f 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -132,6 +132,14 @@ android:excludeFromRecents="true"> </activity> + <!-- started from UsbDebuggingManager --> + <activity android:name=".usb.UsbDebuggingActivity" + android:permission="android.permission.MANAGE_USB" + android:theme="@*android:style/Theme.Holo.Dialog.Alert" + android:finishOnCloseSystemDialogs="true" + android:excludeFromRecents="true"> + </activity> + <!-- started from NetworkPolicyManagerService --> <activity android:name=".net.NetworkOverLimitActivity" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 2ce950f5c777..5747f22948c2 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -154,6 +154,15 @@ <!-- Checkbox label for USB accessory dialogs. [CHAR LIMIT=50] --> <string name="always_use_accessory">Use by default for this USB accessory</string> + <!-- Title of confirmation dialog for USB debugging --> + <string name="usb_debugging_title">Allow USB Debugging?</string> + + <!-- Message of confirmation dialog for USB debugging --> + <string name="usb_debugging_message">Allow USB Debugging from this computer?\nYour RSA key fingerprint is\n<xliff:g id="fingerprint">%1$s</xliff:g></string> + + <!-- Option to always allow USB debugging from the attached computer --> + <string name="usb_debugging_always">Always allow this computer</string> + <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running on a phone). [CHAR LIMIT=25] --> <string name="compat_mode_on">Zoom to fill screen</string> diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java new file mode 100644 index 000000000000..9146ccd5b3fb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.usb; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.graphics.Typeface; +import android.hardware.usb.IUsbManager; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbManager; +import android.os.Bundle; +import android.os.IBinder; +import android.os.ServiceManager; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.CheckBox; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.internal.app.AlertActivity; +import com.android.internal.app.AlertController; + +import com.android.systemui.R; + +public class UsbDebuggingActivity extends AlertActivity + implements DialogInterface.OnClickListener { + private static final String TAG = "UsbDebuggingActivity"; + + private CheckBox mAlwaysAllow; + private UsbDisconnectedReceiver mDisconnectedReceiver; + private String mKey; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + + mDisconnectedReceiver = new UsbDisconnectedReceiver(this); + Intent intent = getIntent(); + String fingerprints = intent.getStringExtra("fingerprints"); + mKey = intent.getStringExtra("key"); + + if (fingerprints == null || mKey == null) { + finish(); + return; + } + + final AlertController.AlertParams ap = mAlertParams; + ap.mTitle = getString(R.string.usb_debugging_title); + ap.mIconId = com.android.internal.R.drawable.ic_dialog_usb; + ap.mMessage = getString(R.string.usb_debugging_message, fingerprints); + ap.mPositiveButtonText = getString(android.R.string.ok); + ap.mNegativeButtonText = getString(android.R.string.cancel); + ap.mPositiveButtonListener = this; + ap.mNegativeButtonListener = this; + + // add "always allow" checkbox + LayoutInflater inflater = LayoutInflater.from(ap.mContext); + View checkbox = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null); + mAlwaysAllow = (CheckBox)checkbox.findViewById(com.android.internal.R.id.alwaysUse); + mAlwaysAllow.setText(getString(R.string.usb_debugging_always)); + ap.mView = checkbox; + + setupAlert(); + } + + private class UsbDisconnectedReceiver extends BroadcastReceiver { + private final Activity mActivity; + public UsbDisconnectedReceiver(Activity activity) { + mActivity = activity; + } + + @Override + public void onReceive(Context content, Intent intent) { + String action = intent.getAction(); + if (!UsbManager.ACTION_USB_STATE.equals(action)) { + return; + } + boolean connected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false); + if (!connected) { + mActivity.finish(); + } + } + } + + @Override + public void onStart() { + super.onStart(); + IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_STATE); + registerReceiver(mDisconnectedReceiver, filter); + } + + @Override + protected void onStop() { + if (mDisconnectedReceiver != null) { + unregisterReceiver(mDisconnectedReceiver); + } + super.onStop(); + } + + @Override + public void onClick(DialogInterface dialog, int which) { + boolean allow = (which == AlertDialog.BUTTON_POSITIVE); + boolean alwaysAllow = allow && mAlwaysAllow.isChecked(); + try { + IBinder b = ServiceManager.getService(USB_SERVICE); + IUsbManager service = IUsbManager.Stub.asInterface(b); + if (allow) { + service.allowUsbDebugging(alwaysAllow, mKey); + } else { + service.denyUsbDebugging(); + } + } catch (Exception e) { + Log.e(TAG, "Unable to notify Usb service", e); + } + finish(); + } +} |