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

Commit 976ba5b9 authored by mrulhania's avatar mrulhania Committed by Manjeet Rulhania
Browse files

Remove logs for debugging bluetooth permission check 

The root cause is fixed in ag/29012378

Bug: 302609140
Bug: 333931259
Test: build
Flag: EXEMPT bug fix
Change-Id: I2dc23a159e09e682723d88845116090d17e0b990
parent e06df116

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

+0 −34
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 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;
@@ -3115,11 +3114,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    packageName);

        }

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

            // 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 incoming "

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

            }

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

                    packageName);

        }
@@ -3149,13 +3143,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
            }

        } catch (SecurityException e) {

            logVerifyAndGetBypassFailure(uid, e, "noteOperation");

            // 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"

                        + " verifyAndGetBypass returned a SecurityException for package: "

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

                        + attributionTag, e);

            }

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

                    packageName);

        }
@@ -3173,17 +3160,6 @@ 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/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 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);

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

                    scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag,

                            virtualDeviceId, flags, uidMode);

                    // TODO(b/302609140): 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 {
@@ -3252,11 +3223,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    attributedOp.rejected(uidState.getState(), flags);

                    scheduleOpNotedIfNeededLocked(code, uid, packageName, attributionTag,

                            virtualDeviceId, flags, mode);

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

+1 −17
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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;
@@ -1640,22 +1639,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                        throw new SecurityException(msg + ":" + e.getMessage());

                    }

                }

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

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

                return Math.max(checkedOpResult, notedOpResult);

            }

        }