Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2af9be6 authored by Geoffrey Borggaard's avatar Geoffrey Borggaard Committed by Android Git Automerger
Browse files

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

* commit 'bfab323c':
  Setting ADB_ENABLED may result in a SecurityException.
parents 42d9bf66 bfab323c

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -209,8 +209,13 @@ public class UsbDeviceManager { 
        mUseUsbNotification = !massStorageSupported;

        mUseUsbNotification = !massStorageSupported;





        // make sure the ADB_ENABLED setting value matches the current state

        // 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);

        mHandler.sendEmptyMessage(MSG_SYSTEM_READY);

    }

    }