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

Commit b126345f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unify WIFI_PERSISTENT_CONFIG_PROPERTY constant" into main am: 40ca369d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3528952



Change-Id: I4d701888091cb6b0d41238a803683d5d9042ff97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f17f41d8 40ca369d

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;