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

Commit 833fb8b8 authored by Prameet Shah's avatar Prameet Shah Committed by Automerger Merge Worker
Browse files

Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am:... 

Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" am: 99468347 am: a4c70add am: b157ddb8 am: c14b86f9 am: 2d15671d

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



Change-Id: I7c3ca4ff2ed8f083b161438f964985ec62361780
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e442860c 2d15671d

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

+2 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ public class AdbDebuggingManager { 
                                    + " Not enabling adbwifi.");

                            Settings.Global.putInt(mContentResolver,

                                    Settings.Global.ADB_WIFI_ENABLED, 0);

                            return;

                        }



                        // Check for network change
@@ -675,6 +676,7 @@ public class AdbDebuggingManager { 
                            Slog.e(TAG, "Unable to get the wifi ap's BSSID. Disabling adbwifi.");

                            Settings.Global.putInt(mContentResolver,

                                    Settings.Global.ADB_WIFI_ENABLED, 0);

                            return;

                        }

                        synchronized (mAdbConnectionInfo) {

                            if (!bssid.equals(mAdbConnectionInfo.getBSSID())) {