Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I9acb1145,Ie1bc4a92 into rvc-dev

Browse Source 
* changes:
  UsbDebuggingActivity: notify failure in onDestroy, not onStop.
  AdbDebuggingManager: improve logging.
This commit is contained in:
Josh Gao
2020-06-26 20:54:09 +00:00
committed by Android (Google) Code Review
parent 7d42405bc5 7b66783514
commit 2ca72c4756
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
View File

@@ -139,13 +139,18 @@ public class UsbDebuggingActivity extends AlertActivity
if (mDisconnectedReceiver != null) { if (mDisconnectedReceiver != null) {
mBroadcastDispatcher.unregisterReceiver(mDisconnectedReceiver); 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 // 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 // other way then notify the service to deny the connection to ensure system_server sends
// a response to adbd. // a response to adbd.
if (!mServiceNotified) { if (!mServiceNotified) {
notifyService(false); notifyService(false);
} }
super.onStop(); super.onDestroy();
} }
@Override @Override

3
services/core/java/com/android/server/adb/AdbDebuggingManager.java
View File

@@ -878,6 +878,7 @@ public class AdbDebuggingManager {
case MESSAGE_ADB_DENY: case MESSAGE_ADB_DENY:
if (mThread != null) { if (mThread != null) {
Slog.w(TAG, "Denying adb confirmation");
mThread.sendResponse("NO"); mThread.sendResponse("NO");
logAdbConnectionChanged(null, AdbProtoEnums.USER_DENIED, false); logAdbConnectionChanged(null, AdbProtoEnums.USER_DENIED, false);
} }
@@ -887,7 +888,7 @@ public class AdbDebuggingManager {
String key = (String) msg.obj; String key = (String) msg.obj;
if ("trigger_restart_min_framework".equals( if ("trigger_restart_min_framework".equals(
SystemProperties.get("vold.decrypt"))) { 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) { if (mThread != null) {
mThread.sendResponse("NO"); mThread.sendResponse("NO");
logAdbConnectionChanged(key, AdbProtoEnums.DENIED_VOLD_DECRYPT, false); logAdbConnectionChanged(key, AdbProtoEnums.DENIED_VOLD_DECRYPT, false);