mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-15 02:44:23 -05:00
91 lines
3.5 KiB
Diff
91 lines
3.5 KiB
Diff
From e02728d51e013033f3cc168e8630d0322ccfd803 Mon Sep 17 00:00:00 2001
|
|
From: Fan Wu <cechkahn@google.com>
|
|
Date: Mon, 22 Jul 2024 16:12:46 +0800
|
|
Subject: [PATCH] [BACKPORT] Checks cross user permission before handling
|
|
intent
|
|
|
|
Bug: 326057017
|
|
|
|
Test: atest
|
|
|
|
Flag: EXEMPT bug fix
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35)
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f67d233c1cd653c113df5956f1ed29a42e1d32f)
|
|
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
|
|
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
|
|
---
|
|
.../settings/applications/AppInfoBase.java | 38 ++++++++++++++++++-
|
|
1 file changed, 36 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
|
|
index 71043400ff8..ef5297acaec 100644
|
|
--- a/src/com/android/settings/applications/AppInfoBase.java
|
|
+++ b/src/com/android/settings/applications/AppInfoBase.java
|
|
@@ -18,7 +18,9 @@
|
|
|
|
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;
|
|
@@ -38,6 +40,7 @@
|
|
import android.text.TextUtils;
|
|
import android.util.Log;
|
|
|
|
+import androidx.annotation.VisibleForTesting;
|
|
import androidx.appcompat.app.AlertDialog;
|
|
import androidx.fragment.app.DialogFragment;
|
|
import androidx.fragment.app.Fragment;
|
|
@@ -134,8 +137,13 @@ protected String retrieveAppEntry() {
|
|
}
|
|
}
|
|
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
|
|
- mUserId = ((UserHandle) intent.getParcelableExtra(
|
|
- Intent.EXTRA_USER_HANDLE)).getIdentifier();
|
|
+ mUserId = ((UserHandle) intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE))
|
|
+ .getIdentifier();
|
|
+ if (mUserId != UserHandle.myUserId() && !hasInteractAcrossUsersPerm()) {
|
|
+ Log.w(TAG, "Intent not valid.");
|
|
+ finish();
|
|
+ return "";
|
|
+ }
|
|
} else {
|
|
mUserId = UserHandle.myUserId();
|
|
}
|
|
@@ -158,6 +166,32 @@ protected String retrieveAppEntry() {
|
|
return mPackageName;
|
|
}
|
|
|
|
+ @VisibleForTesting
|
|
+ protected boolean hasInteractAcrossUsersPerm() {
|
|
+ Activity activity = getActivity();
|
|
+ if (activity == null) {
|
|
+ return false;
|
|
+ }
|
|
+ String callingPackageName = null;
|
|
+ try {
|
|
+ callingPackageName = ActivityManager.getService()
|
|
+ .getLaunchedFromPackage(activity.getActivityToken());
|
|
+ } catch (Exception e) {
|
|
+ return false;
|
|
+ }
|
|
+ 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) {
|
|
Log.i(TAG, "appChanged=" + appChanged);
|
|
Intent intent = new Intent();
|