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

Commit c8e3afba authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

Clean up ADB over network 

- Don't read or set "persist.service.adb.enable", it is deprecated
  and is read and cleared by UsbDeviceManager every boot. Trying
  to read it will always yield "" because it was already cleared
  by UsbDeviceManager (thus disabling adb debug every boot). Trying
  to set it doesn't have any effect because adb is now started by
  "sys.usb.config".

- In UsbDeviceManager, don't call AdbSettingsObserver when enabling
  or disabling adb over network because that function is only for
  enabling/disabling adb.

Change-Id: Ib6c1a655277c7f6d7395595ccfe3bac29c0582fe
parent 48ba49d3

services/java/com/android/server/SystemServer.java

+0 −20
Original line number Diff line number Diff line
@@ -76,19 +76,6 @@ class ServerThread extends Thread { 
        Log.wtf(TAG, "BOOT FAILURE " + msg, e);

    }



    private class AdbSettingsObserver extends ContentObserver {

        public AdbSettingsObserver() {

            super(null);

        }

        @Override

        public void onChange(boolean selfChange) {

            boolean enableAdb = (Settings.Secure.getInt(mContentResolver,

                Settings.Secure.ADB_ENABLED, 0) > 0);

            // setting this secure property will start or stop adbd

            SystemProperties.set("persist.service.adb.enable", enableAdb ? "1" : "0");

        }

    }



    private class AdbPortObserver extends ContentObserver {

        public AdbPortObserver() {

            super(null);
@@ -598,18 +585,11 @@ class ServerThread extends Thread { 
        Settings.Secure.putInt(mContentResolver, Settings.Secure.ADB_PORT,

                Integer.parseInt(SystemProperties.get("service.adb.tcp.port", "-1")));



        Settings.Secure.putInt(mContentResolver, Settings.Secure.ADB_ENABLED,

                "1".equals(SystemProperties.get("persist.service.adb.enable")) ? 1 : 0);



        // register observer to listen for settings changes

        mContentResolver.registerContentObserver(

            Settings.Secure.getUriFor(Settings.Secure.ADB_PORT),

            false, new AdbPortObserver());



        mContentResolver.registerContentObserver(

            Settings.Secure.getUriFor(Settings.Secure.ADB_ENABLED),

            false, new AdbSettingsObserver());



        // Before things start rolling, be sure we have decided whether

        // we are in safe mode.

        final boolean safeMode = wm.detectSafeMode();

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

+0 −4
Original line number Diff line number Diff line
@@ -297,10 +297,6 @@ public class UsbDeviceManager { 
                        Settings.Secure.getUriFor(Settings.Secure.ADB_ENABLED),

                                false, new AdbSettingsObserver());



                mContentResolver.registerContentObserver(

                        Settings.Secure.getUriFor(Settings.Secure.ADB_PORT),

                                false, new AdbSettingsObserver());



                // Watch for USB configuration changes

                mUEventObserver.startObserving(USB_STATE_MATCH);

                mUEventObserver.startObserving(ACCESSORY_START_MATCH);