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

Commit 007a226b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check the permission of the callingUid instead of the calling package"... 

Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb772

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851



Change-Id: I7d226da8aef1c0823738324cd064c7ff96e0ecf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93f0bf82 969cb772

src/com/android/settings/applications/AppInfoBase.java

+13 −12
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; 


import android.Manifest;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.Dialog;

import android.app.admin.DevicePolicyManager;

import android.app.settings.SettingsEnums;
@@ -33,6 +34,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.hardware.usb.IUsbManager;

import android.os.Bundle;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;
@@ -171,20 +173,19 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
        if (!(activity instanceof SettingsActivity)) {

            return false;

        }

        final String callingPackageName =

                ((SettingsActivity) activity).getInitialCallingPackage();



        if (TextUtils.isEmpty(callingPackageName)) {

            Log.w(TAG, "Not able to get calling package name for permission check");

            return false;

        }

        if (mPm.checkPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingPackageName)

                != PackageManager.PERMISSION_GRANTED) {

            Log.w(TAG, "Package " + callingPackageName + " does not have required permission "

        try {

            int callerUid = ActivityManager.getService().getLaunchedFromUid(

                    activity.getActivityToken());

            if (ActivityManager.checkUidPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,

                    callerUid) != PackageManager.PERMISSION_GRANTED) {

                Log.w(TAG, "Uid " + callerUid + " does not have required permission "

                        + Manifest.permission.INTERACT_ACROSS_USERS_FULL);

                return false;

            }

            return true;

        } catch (RemoteException e) {

            return false;

        }

    }



    protected void setIntentAndFinish(boolean appChanged) {