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

Commit e8551a88 authored by Eugene Susla's avatar Eugene Susla Committed by Sterling Huber
Browse files

RESTRICT AUTOMERGE 

Fix CDM package check

CDM was using a pckage check that returns a value intead of throwing,
resulting in failing to throw on querying other package's associations

Test: ensure attached bug no longer reproduces
Bug: 167244818
Change-Id: I21319b6f5495dcae681541c76b847aad0c00b8ab
parent 752cb249

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.Preconditions.checkState; 
import android.Manifest;

import android.annotation.CheckResult;

import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.PendingIntent;

import android.companion.AssociationRequest;

import android.companion.CompanionDeviceManager;
@@ -273,7 +274,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