Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-05 20:12:26 +00:00
committed by Android (Google) Code Review
parent 8aeade4629 9ec3bf497e
commit e0d7430c0e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -25,6 +25,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna
import android.annotation.CheckResult; import android.annotation.CheckResult;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.companion.AssociationRequest; import android.companion.AssociationRequest;
import android.companion.CompanionDeviceManager; import android.companion.CompanionDeviceManager;
@@ -297,7 +298,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
checkArgument(getCallingUserId() == userId, checkArgument(getCallingUserId() == userId,
"Must be called by either same user or system"); "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 @Override