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

Commit 382b7c8b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" into tm-qpr-dev

parents 9507b446 a9d6896c

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())) {