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

Commit 40ca369d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Unify WIFI_PERSISTENT_CONFIG_PROPERTY constant" into main

parents d1b89c0c ffd88ca9

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

+2 −4
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ public class AdbDebuggingManager { 
    @Nullable private final File mUserKeyFile;

    @Nullable private final File mTempKeysFile;



    private static final String WIFI_PERSISTENT_CONFIG_PROPERTY =

            "persist.adb.tls_server.enable";

    private static final String WIFI_PERSISTENT_GUID =

            "persist.adb.wifi.guid";

    private static final int PAIRING_CODE_LENGTH = 6;
@@ -1089,7 +1087,7 @@ public class AdbDebuggingManager { 
                    intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

                    mContext.registerReceiver(mBroadcastReceiver, intentFilter);



                    SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "1");

                    SystemProperties.set(AdbService.WIFI_PERSISTENT_CONFIG_PROPERTY, "1");

                    mConnectionPortPoller =

                            new AdbDebuggingManager.AdbConnectionPortPoller(mPortListener);

                    mConnectionPortPoller.start();
@@ -1139,7 +1137,7 @@ public class AdbDebuggingManager { 
                    intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

                    mContext.registerReceiver(mBroadcastReceiver, intentFilter);



                    SystemProperties.set(WIFI_PERSISTENT_CONFIG_PROPERTY, "1");

                    SystemProperties.set(AdbService.WIFI_PERSISTENT_CONFIG_PROPERTY, "1");

                    mConnectionPortPoller =

                            new AdbDebuggingManager.AdbConnectionPortPoller(mPortListener);

                    mConnectionPortPoller.start();

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class AdbService extends IAdbManager.Stub { 
     * May also contain vendor-specific default functions for testing purposes.

     */

    private static final String USB_PERSISTENT_CONFIG_PROPERTY = "persist.sys.usb.config";

    private static final String WIFI_PERSISTENT_CONFIG_PROPERTY = "persist.adb.tls_server.enable";

    static final String WIFI_PERSISTENT_CONFIG_PROPERTY = "persist.adb.tls_server.enable";



    private final Context mContext;

    private final ContentResolver mContentResolver;