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

Commit 9bb4fe60 authored by Karishma Vakil's avatar Karishma Vakil Committed by Android (Google) Code Review
Browse files

Merge "[Permissions] Add more temporary logging to debug Bluetooth security exception" into main

parents dc292749 12a390bf

services/core/java/com/android/server/appop/AppOpsService.java

+7 −1
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

                    }