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

Commit 6d075f0d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix HistoricalAppOps collection."

parents e6c57082 727e0e78

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

+2 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState; 
import static android.content.Intent.ACTION_PACKAGE_REMOVED;

import static android.content.Intent.EXTRA_REPLACING;

import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;

import static android.os.Process.STATSD_UID;



import static com.android.server.appop.AppOpsService.ModeCallback.ALL_OPS;
@@ -1890,9 +1889,9 @@ public class AppOpsService extends IAppOpsService.Stub { 


        ActivityManagerInternal ami = LocalServices.getService(ActivityManagerInternal.class);

        boolean isCallerInstrumented = ami.isUidCurrentlyInstrumented(Binder.getCallingUid());

        boolean isCallerStatsCollector = Binder.getCallingUid() == STATSD_UID;

        boolean isCallerSystem = Binder.getCallingPid() == Process.myPid();



        if (!isCallerStatsCollector && !isCallerInstrumented) {

        if (!isCallerSystem && !isCallerInstrumented) {

            mHandler.post(() -> callback.sendResult(new Bundle()));

            return;

        }