PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649

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

Change-Id: I589e0940eba59d1696d4b3d0ec32b0ff19ac447f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2025-02-01 03:52:09 -08:00
committed by Automerger Merge Worker
parent b910ad3a9e 54ee76b649
commit d95916adb5
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -20,6 +20,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -34,6 +35,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.hardware.usb.IUsbManager; import android.hardware.usb.IUsbManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -172,20 +174,19 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
if (!(activity instanceof SettingsActivity)) { if (!(activity instanceof SettingsActivity)) {
return false; return false;
} }
final String callingPackageName = try {
((SettingsActivity) activity).getInitialCallingPackage(); int callerUid = ActivityManager.getService().getLaunchedFromUid(
activity.getActivityToken());
if (TextUtils.isEmpty(callingPackageName)) { if (ActivityManager.checkUidPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,
Log.w(TAG, "Not able to get calling package name for permission check"); callerUid) != PackageManager.PERMISSION_GRANTED) {
return false; Log.w(TAG, "Uid " + callerUid + " does not have required permission "
}
if (mPm.checkPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingPackageName)
!= PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "Package " + callingPackageName + " does not have required permission "
+ Manifest.permission.INTERACT_ACROSS_USERS_FULL); + Manifest.permission.INTERACT_ACROSS_USERS_FULL);
return false; return false;
} }
return true; return true;
} catch (RemoteException e) {
return false;
}
} }
protected void setIntentAndFinish(boolean appChanged) { protected void setIntentAndFinish(boolean appChanged) {