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

Merge "Checks cross user permission before handling intent" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Antol
2024-09-05 03:07:30 +00:00
committed by Android (Google) Code Review
parent a1fea68952 ff4daf4bf4
commit d6ee2d0a98
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.settings.applications;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
@@ -38,6 +39,7 @@ import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -134,8 +136,13 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
} }
} }
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) { if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
mUserId = ((UserHandle) intent.getParcelableExtra( mUserId = ((UserHandle) intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE))
Intent.EXTRA_USER_HANDLE)).getIdentifier(); .getIdentifier();
if (mUserId != UserHandle.myUserId() && !hasInteractAcrossUsersPermission()) {
Log.w(TAG, "Intent not valid.");
finish();
return "";
}
} else { } else {
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
} }
@@ -158,6 +165,28 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
return mPackageName; return mPackageName;
} }
@VisibleForTesting
protected boolean hasInteractAcrossUsersPermission() {
Activity activity = getActivity();
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 "
+ Manifest.permission.INTERACT_ACROSS_USERS_FULL);
return false;
}
return true;
}
protected void setIntentAndFinish(boolean appChanged) { protected void setIntentAndFinish(boolean appChanged) {
Log.i(TAG, "appChanged=" + appChanged); Log.i(TAG, "appChanged=" + appChanged);
Intent intent = new Intent(); Intent intent = new Intent();