From ffcfe3411ff6ccaa35c2873151e31c879506dadd Mon Sep 17 00:00:00 2001 From: Xiaohui Chen Date: Wed, 13 May 2015 13:18:36 -0700 Subject: usb debugging: show alert to secondary user Bug: 12785423 Change-Id: If7f60899cfdaca7bdad560bd59a78f5be74c24be --- packages/SystemUI/AndroidManifest.xml | 5 ++ packages/SystemUI/res/values/strings.xml | 6 ++ .../usb/UsbDebuggingSecondaryUserActivity.java | 96 ++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java (limited to 'packages') diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index cc8e46b..c259573 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -276,6 +276,11 @@ android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> + + Always allow from this computer + + USB debugging not allowed + + + The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user \u201C%s\u201D. + Zoom to fill screen diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java new file mode 100644 index 0000000..9ce771b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingSecondaryUserActivity.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2015 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.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.UserInfo; +import android.hardware.usb.UsbManager; +import android.os.Bundle; +import android.os.SystemProperties; +import android.os.UserHandle; +import android.os.UserManager; + +import com.android.internal.app.AlertActivity; +import com.android.internal.app.AlertController; +import com.android.systemui.R; + +public class UsbDebuggingSecondaryUserActivity extends AlertActivity + implements DialogInterface.OnClickListener { + private UsbDisconnectedReceiver mDisconnectedReceiver; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + + if (SystemProperties.getInt("service.adb.tcp.port", 0) == 0) { + mDisconnectedReceiver = new UsbDisconnectedReceiver(this); + } + + final AlertController.AlertParams ap = mAlertParams; + ap.mTitle = getString(R.string.usb_debugging_secondary_user_title); + UserInfo user = UserManager.get(this).getUserInfo(UserHandle.USER_OWNER); + ap.mMessage = getString(R.string.usb_debugging_secondary_user_message, user.name); + ap.mPositiveButtonText = getString(android.R.string.ok); + ap.mPositiveButtonListener = this; + + 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)) { + 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) { + finish(); + } +} -- cgit v1.1