diff options
| author | Geoffrey Borggaard <geoffreyb@google.com> | 2014-11-19 14:22:56 -0500 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-11-19 12:04:41 -0800 |
| commit | 8de29d69d3df0e4bb1ead92493a5b3b20ade8f17 (patch) | |
| tree | de0a8a6590dc36bb8c378729835627eae935dabf | |
| parent | 9e3db14425cf09e4a34d7f0a8ad85cbfeb9bfe94 (diff) | |
| download | base-8de29d69d3df0e4bb1ead92493a5b3b20ade8f17.tar.gz | |
Setting ADB_ENABLED may result in a SecurityException.
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477
Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index c63eb1864b6c..23ba3b6de3e0 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -209,8 +209,13 @@ public class UsbDeviceManager { mUseUsbNotification = !massStorageSupported; // make sure the ADB_ENABLED setting value matches the current state - Settings.Global.putInt(mContentResolver, Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0); - + try { + Settings.Global.putInt(mContentResolver, + Settings.Global.ADB_ENABLED, mAdbEnabled ? 1 : 0); + } catch (SecurityException e) { + // If UserManager.DISALLOW_DEBUGGING_FEATURES is on, that this setting can't be changed. + Slog.d(TAG, "ADB_ENABLED is restricted."); + } mHandler.sendEmptyMessage(MSG_SYSTEM_READY); } |