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

Commit ec3bba16 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I3e637590,I92353399 into main 

* changes:
  Revert "adb: fix the initial adbd state in AdbService"
  Revert "adb: check the current Settings values after adding ContentObserver"
parents d25079df 011a02fe

services/core/java/com/android/server/adb/AdbService.java

+1 −19
Original line number Diff line number Diff line
@@ -162,20 +162,6 @@ public class AdbService extends IAdbManager.Stub { 
            mContentResolver.registerContentObserver(

                    Settings.Global.getUriFor(Settings.Global.ADB_WIFI_ENABLED),

                    false, mObserver);



            /*

             * The observer will only trigger when the value *changes*.

             * We need to initialize the state according to the current setting value.

             */

            if (Settings.Global.getInt(mContentResolver,

                                       Settings.Global.ADB_ENABLED, 0) != 0) {

                mObserver.setInitialAdbState(true, AdbTransportType.USB);

            }



            if (Settings.Global.getInt(mContentResolver,

                                       Settings.Global.ADB_WIFI_ENABLED, 0) != 0) {

                mObserver.setInitialAdbState(true, AdbTransportType.WIFI);

            }

        } catch (Exception e) {

            Slog.e(TAG, "Error in registerContentObservers", e);

        }
@@ -211,10 +197,6 @@ public class AdbService extends IAdbManager.Stub { 
                setAdbEnabled(shouldEnable, AdbTransportType.WIFI);

            }

        }



        private void setInitialAdbState(boolean enable, byte transportType) {

            setAdbEnabled(enable, transportType);

        }

    }



    private static final String TAG = AdbService.class.getSimpleName();
@@ -244,7 +226,7 @@ public class AdbService extends IAdbManager.Stub { 


    private final AdbDebuggingManager mDebuggingManager;



    private AdbSettingsObserver mObserver;

    private ContentObserver mObserver;



    private AdbService(Context context) {

        mContext = context;