Merge "Pass UserHandle when opening app perm settings from dashboard" into sc-dev
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionDetailsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionDetailsFragment.java
index 06fcb0d..b1c99c6 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionDetailsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionDetailsFragment.java
@@ -503,6 +503,7 @@
PermissionHistoryPreference permissionUsagePreference = new
PermissionHistoryPreference(context,
+ UserHandle.getUserHandleForUid(usage.mAppPermissionUsage.getApp().getUid()),
usage.mAppPermissionUsage.getPackageName(),
usage.mAppPermissionUsage.getApp().getIcon(),
usage.mAppPermissionUsage.getApp().getLabel(),
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionHistoryPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionHistoryPreference.java
index 7db4b3d..64daee8 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionHistoryPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionHistoryPreference.java
@@ -23,6 +23,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
import android.text.format.DateFormat;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -58,6 +59,7 @@
private static final String LOG_TAG = "PermissionHistoryPreference";
private final Context mContext;
+ private final UserHandle mUserHandle;
private final String mPackageName;
private final String mPermissionGroup;
private final String mAccessTime;
@@ -72,7 +74,8 @@
private Drawable mWidgetIcon;
- public PermissionHistoryPreference(@NonNull Context context, @NonNull String pkgName,
+ public PermissionHistoryPreference(@NonNull Context context,
+ @NonNull UserHandle userHandle, @NonNull String pkgName,
@NonNull Drawable appIcon,
@NonNull String preferenceTitle,
@NonNull String permissionGroup, @NonNull String accessTime,
@@ -80,6 +83,7 @@
@NonNull ArrayList<String> attributionTags, boolean isLastUsage) {
super(context);
mContext = context;
+ mUserHandle = userHandle;
mPackageName = pkgName;
mPermissionGroup = permissionGroup;
mAccessTime = accessTime;
@@ -144,6 +148,7 @@
setOnPreferenceClickListener((preference) -> {
Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);
+ intent.putExtra(Intent.EXTRA_USER, mUserHandle);
intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackageName);
mContext.startActivity(intent);