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

Commit 25dac147 authored by Evan Severson's avatar Evan Severson
Browse files

Revert "Remove logs for debugging bluetooth permission check" 

This reverts commit 976ba5b9.

Reason for revert: We need them back
Bug: 333931259
Test: Manual
Flag: EXEMPT temporary logs

Change-Id: Id84248ef279fd50c0331e8f34adb46658fe28b19
parent c2f77d14

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

+34 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static android.app.AppOpsManager.MODE_DEFAULT; 
import static android.app.AppOpsManager.MODE_ERRORED;

import static android.app.AppOpsManager.MODE_FOREGROUND;

import static android.app.AppOpsManager.MODE_IGNORED;

import static android.app.AppOpsManager.OP_BLUETOOTH_CONNECT;

import static android.app.AppOpsManager.OP_CAMERA;

import static android.app.AppOpsManager.OP_CAMERA_SANDBOXED;

import static android.app.AppOpsManager.OP_FLAGS_ALL;
@@ -3269,6 +3270,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
                        packageName);

            }

            if (!isIncomingPackageValid(packageName, UserHandle.getUserId(uid))) {

                // TODO(b/333931259): Remove extra logging after this issue is diagnosed.

                if (code == OP_BLUETOOTH_CONNECT) {

                    Slog.e(TAG, "noting OP_BLUETOOTH_CONNECT returned MODE_ERRORED as incoming "

                            + "package: " + packageName + " and uid: " + uid + " is invalid");

                }

                return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,

                        packageName);

            }
@@ -3308,6 +3314,13 @@ public class AppOpsService extends IAppOpsService.Stub { 
            }

        } catch (SecurityException e) {

            logVerifyAndGetBypassFailure(uid, e, "noteOperation");

            // TODO(b/333931259): Remove extra logging after this issue is diagnosed.

            if (code == OP_BLUETOOTH_CONNECT) {

                Slog.e(TAG, "noting OP_BLUETOOTH_CONNECT returned MODE_ERRORED as"

                        + " verifyAndGetBypass returned a SecurityException for package: "

                        + packageName + " and uid: " + uid + " and attributionTag: "

                        + attributionTag, e);

            }

            return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag,

                    packageName);

        }
@@ -3325,6 +3338,17 @@ public class AppOpsService extends IAppOpsService.Stub { 
                if (DEBUG) Slog.d(TAG, "noteOperation: no op for code " + code + " uid " + uid

                        + " package " + packageName + "flags: " +

                        AppOpsManager.flagsToString(flags));

                // TODO(b/333931259): 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 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);

            }
@@ -3369,6 +3393,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    attributedOp.rejected(uidState.getState(), flags);

                    scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag,

                            virtualDeviceId, flags, uidMode);

                    // TODO(b/333931259): Remove extra logging after this issue is diagnosed.

                    if (code == OP_BLUETOOTH_CONNECT && uidMode == MODE_ERRORED) {

                        Slog.e(TAG, "noting OP_BLUETOOTH_CONNECT returned MODE_ERRORED as"

                                + " uid mode is MODE_ERRORED");

                    }

                    return new SyncNotedAppOp(uidMode, code, attributionTag, packageName);

                }

            } else {
@@ -3388,6 +3417,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    attributedOp.rejected(uidState.getState(), flags);

                    scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag,

                            virtualDeviceId, flags, mode);

                    // TODO(b/333931259): Remove extra logging after this issue is diagnosed.

                    if (code == OP_BLUETOOTH_CONNECT && mode == MODE_ERRORED) {

                        Slog.e(TAG, "noting OP_BLUETOOTH_CONNECT returned MODE_ERRORED as"

                                + " package mode is MODE_ERRORED");

                    }

                    return new SyncNotedAppOp(mode, code, attributionTag, packageName);

                }

            }

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

+17 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.app.AppOpsManager.ATTRIBUTION_FLAGS_NONE; 
import static android.app.AppOpsManager.MODE_ALLOWED;

import static android.app.AppOpsManager.MODE_ERRORED;

import static android.app.AppOpsManager.MODE_IGNORED;

import static android.app.AppOpsManager.OP_BLUETOOTH_CONNECT;

import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISALLOWED;

import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISCOURAGED;

import static android.permission.flags.Flags.serverSideAttributionRegistration;
@@ -1668,7 +1669,22 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                        throw new SecurityException(msg + ":" + e.getMessage());

                    }

                }

                return Math.max(checkedOpResult, notedOpResult);

                int result = Math.max(checkedOpResult, notedOpResult);

                // TODO(b/333931259): Remove extra logging after this issue is diagnosed.

                if (op == OP_BLUETOOTH_CONNECT && result == MODE_ERRORED) {

                    if (result == checkedOpResult) {

                        Slog.e(LOG_TAG, "BLUETOOTH_CONNECT permission hard denied as"

                                + " checkOp for resolvedAttributionSource "

                                + resolvedAttributionSource + " and op " + op

                                + " returned MODE_ERRORED");

                    } else {

                        Slog.e(LOG_TAG, "BLUETOOTH_CONNECT permission hard denied as"

                                + " noteOp for resolvedAttributionSource "

                                + resolvedAttributionSource + " and op " + notedOp

                                + " returned MODE_ERRORED");

                    }

                }

                return result;

            }

        }