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

Commit ee729e7a authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: 9ec3bf49 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939926

Change-Id: I80dd5346effd6c3372e42dc12749f3074cdeddd1
parents f36f2de3 9ec3bf49

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna 


import android.annotation.CheckResult;

import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.PendingIntent;

import android.companion.AssociationRequest;

import android.companion.CompanionDeviceManager;
@@ -297,7 +298,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 


            checkArgument(getCallingUserId() == userId,

                    "Must be called by either same user or system");

            mAppOpsManager.checkPackage(Binder.getCallingUid(), pkg);

            int callingUid = Binder.getCallingUid();

            if (mAppOpsManager.checkPackage(callingUid, pkg) != AppOpsManager.MODE_ALLOWED) {

                throw new SecurityException(pkg + " doesn't belong to uid " + callingUid);

            }

        }



        @Override