Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev

Browse Source 
automerge: aba9aba

* commit 'aba9abaefabf9b78c3df4b0ce01aa52184b34764':
  Setting ADB_ENABLED may result in a SecurityException.
This commit is contained in:
Geoffrey Borggaard
2014-11-21 01:55:15 +00:00
committed by android-build-merger
parent 3b35226300 aba9abaefa
commit 6c70cde9d2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -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);
}