diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/adb/AdbDebuggingManager.java | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java index bc2a55c8d5c4..7561af770298 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java @@ -139,13 +139,18 @@ public class UsbDebuggingActivity extends AlertActivity if (mDisconnectedReceiver != null) { mBroadcastDispatcher.unregisterReceiver(mDisconnectedReceiver); } + super.onStop(); + } + + @Override + protected void onDestroy() { // If the ADB service has not yet been notified due to this dialog being closed in some // other way then notify the service to deny the connection to ensure system_server sends // a response to adbd. if (!mServiceNotified) { notifyService(false); } - super.onStop(); + super.onDestroy(); } @Override diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index df3b6880fdfb..ed83a644cbfb 100644 --- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java +++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java @@ -878,6 +878,7 @@ public class AdbDebuggingManager { case MESSAGE_ADB_DENY: if (mThread != null) { + Slog.w(TAG, "Denying adb confirmation"); mThread.sendResponse("NO"); logAdbConnectionChanged(null, AdbProtoEnums.USER_DENIED, false); } @@ -887,7 +888,7 @@ public class AdbDebuggingManager { String key = (String) msg.obj; if ("trigger_restart_min_framework".equals( SystemProperties.get("vold.decrypt"))) { - Slog.d(TAG, "Deferring adb confirmation until after vold decrypt"); + Slog.w(TAG, "Deferring adb confirmation until after vold decrypt"); if (mThread != null) { mThread.sendResponse("NO"); logAdbConnectionChanged(key, AdbProtoEnums.DENIED_VOLD_DECRYPT, false); |