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

Commit 0e69c416 authored by Sanjana Sunil's avatar Sanjana Sunil Committed by Automerger Merge Worker
Browse files

Merge "Use uid to query list of implicitly queryable packages" into tm-qpr-dev am: 9c0d0199 

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



Change-Id: I418aaee1880d65cd5b92ec9cbc9f2bffa1f35652
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f09cd18 9c0d0199

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

+7 −5
Original line number Diff line number Diff line
@@ -205,12 +205,12 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot { 
        return mQueriesViaComponent.contains(callingAppId, targetAppId);

    }



    protected boolean isImplicitlyQueryable(int callingAppId, int targetAppId) {

        return mImplicitlyQueryable.contains(callingAppId, targetAppId);

    protected boolean isImplicitlyQueryable(int callingUid, int targetUid) {

        return mImplicitlyQueryable.contains(callingUid, targetUid);

    }



    protected boolean isRetainedImplicitlyQueryable(int callingAppId, int targetAppId) {

        return mRetainedImplicitlyQueryable.contains(callingAppId, targetAppId);

    protected boolean isRetainedImplicitlyQueryable(int callingUid, int targetUid) {

        return mRetainedImplicitlyQueryable.contains(callingUid, targetUid);

    }



    protected boolean isQueryableViaUsesLibrary(int callingAppId, int targetAppId) {
@@ -322,9 +322,11 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot { 
                    || callingAppId == targetPkgSetting.getAppId()) {

                return false;

            } else if (Process.isSdkSandboxUid(callingAppId)) {

                final int targetAppId = targetPkgSetting.getAppId();

                final int targetUid = UserHandle.getUid(userId, targetAppId);

                // we only allow sdk sandbox processes access to forcequeryable packages

                return !isForceQueryable(targetPkgSetting.getAppId())

                      && !isImplicitlyQueryable(callingAppId, targetPkgSetting.getAppId());

                      && !isImplicitlyQueryable(callingUid, targetUid);

            }

            if (mCacheReady) { // use cache

                if (!shouldFilterApplicationUsingCache(callingUid,

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

+4 −4
Original line number Diff line number Diff line
@@ -65,16 +65,16 @@ abstract class AppsFilterLocked extends AppsFilterBase { 
    }



    @Override

    protected boolean isImplicitlyQueryable(int callingAppId, int targetAppId) {

    protected boolean isImplicitlyQueryable(int callingUid, int targetUid) {

        synchronized (mImplicitlyQueryableLock) {

            return super.isImplicitlyQueryable(callingAppId, targetAppId);

            return super.isImplicitlyQueryable(callingUid, targetUid);

        }

    }



    @Override

    protected boolean isRetainedImplicitlyQueryable(int callingAppId, int targetAppId) {

    protected boolean isRetainedImplicitlyQueryable(int callingUid, int targetUid) {

        synchronized (mImplicitlyQueryableLock) {

            return super.isRetainedImplicitlyQueryable(callingAppId, targetAppId);

            return super.isRetainedImplicitlyQueryable(callingUid, targetUid);

        }

    }