diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java | 3 | ||||
| -rwxr-xr-x | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 301914615562..c2c5d91eafa8 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -434,7 +434,8 @@ final class DefaultPermissionGrantPolicy { || !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE, pkg, UserHandle.of(userId)) || !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg, - UserHandle.of(userId))) { + UserHandle.of(userId)) + || pm.isSysComponentOrPersistentPlatformSignedPrivApp(pkg)) { continue; } diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index b57ea0789ef8..ba6fe4812793 100755 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -636,7 +636,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser Slog.e(TAG, "unknown state " + state); return; } - removeMessages(MSG_UPDATE_STATE); + if (configured == 0) removeMessages(MSG_UPDATE_STATE); if (connected == 1) removeMessages(MSG_FUNCTION_SWITCH_TIMEOUT); Message msg = Message.obtain(this, MSG_UPDATE_STATE); msg.arg1 = connected; |