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

Commit 7c9748a6 authored by Patrick Baumann's avatar Patrick Baumann Committed by Android (Google) Code Review
Browse files

Merge "Clear calling identity when calling platformcompat"

parents 4c9fbc50 7218cfcb

services/core/java/com/android/server/pm/AppsFilter.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.pm.parsing.ComponentParseUtils.ParsedIntentInfo; 
import android.content.pm.parsing.ComponentParseUtils.ParsedProvider;

import android.content.pm.parsing.ComponentParseUtils.ParsedProvider;

import android.content.pm.parsing.ComponentParseUtils.ParsedService;

import android.content.pm.parsing.ComponentParseUtils.ParsedService;

import android.net.Uri;

import android.net.Uri;

import android.os.Binder;

import android.os.Process;

import android.os.Process;

import android.os.Trace;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -171,11 +172,13 @@ public class AppsFilter { 
        @Override

        @Override

        public boolean packageIsEnabled(AndroidPackage pkg) {

        public boolean packageIsEnabled(AndroidPackage pkg) {

            Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "packageIsEnabled");

            Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "packageIsEnabled");

            final long token = Binder.clearCallingIdentity();

            try {

            try {

                // TODO(b/135203078): Do not use toAppInfo

                // TODO(b/135203078): Do not use toAppInfo

                return mInjector.getCompatibility().isChangeEnabled(

                return mInjector.getCompatibility().isChangeEnabled(

                        PackageManager.FILTER_APPLICATION_QUERY, pkg.toAppInfoWithoutState());

                        PackageManager.FILTER_APPLICATION_QUERY, pkg.toAppInfoWithoutState());

            } finally {

            } finally {

                Binder.restoreCallingIdentity(token);

                Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

                Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

            }

            }

        }

        }