summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Karishma Vakil <kvakil@google.com> 2024-01-04 20:12:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-04 20:12:57 +0000
commit9bb4fe60eb0c18ce3568e31d91d9b83d6421ec0e (patch)
treef80e3a5c2bd24107ff105264bd135b32661be312
parentdc29274971ed4144d9aec49b504452ab764dcb6c (diff)
parent12a390bf4c4e93fc99d932d68f9e9e01dad901a4 (diff)
Merge "[Permissions] Add more temporary logging to debug Bluetooth security exception" into main
-rw-r--r--services/core/java/com/android/server/appop/AppOpsService.java8
-rw-r--r--services/core/java/com/android/server/pm/permission/PermissionManagerService.java4
2 files changed, 10 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 203ac2cba3ca..df8d9e1a406c 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -2906,7 +2906,13 @@ public class AppOpsService extends IAppOpsService.Stub {
// TODO(b/302609140): Remove extra logging after this issue is diagnosed.
if (code == OP_BLUETOOTH_CONNECT) {
Slog.e(TAG, "noting OP_BLUETOOTH_CONNECT returned MODE_ERRORED as"
- + " #getOpsLocked returned null");
+ + " #getOpsLocked returned null for"
+ + " uid: " + uid
+ + " packageName: " + packageName
+ + " attributionTag: " + attributionTag
+ + " pvr.isAttributionTagValid: " + pvr.isAttributionTagValid
+ + " pvr.bypass: " + pvr.bypass);
+ Slog.e(TAG, "mUidStates.get(" + uid + "): " + mUidStates.get(uid));
}
return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,
packageName);
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index d683855cc5d9..5d710d272fc9 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1405,7 +1405,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
case AppOpsManager.MODE_ERRORED: {
if (permission.equals(Manifest.permission.BLUETOOTH_CONNECT)) {
Slog.e(LOG_TAG, "BLUETOOTH_CONNECT permission hard denied as op"
- + " mode is MODE_ERRORED for " + attributionSource);
+ + " mode is MODE_ERRORED. Permission check was requested for: "
+ + attributionSource + " and op transaction was invoked for "
+ + current);
}
return PermissionChecker.PERMISSION_HARD_DENIED;
}