Merge "Apply visibility to #getSuspendedPackageLauncherExtras"
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 8721603..375ffc4 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -746,11 +746,15 @@
@Override
public Bundle getSuspendedPackageLauncherExtras(String packageName,
UserHandle user) {
- if (!canAccessProfile(user.getIdentifier(), "Cannot get launcher extras")) {
+ final int callingUid = injectBinderCallingUid();
+ final int userId = user.getIdentifier();
+ if (!canAccessProfile(userId, "Cannot get launcher extras")) {
return null;
}
- return mPackageManagerInternal.getSuspendedPackageLauncherExtras(packageName,
- user.getIdentifier());
+ if (mPackageManagerInternal.filterAppAccess(packageName, callingUid, userId)) {
+ return null;
+ }
+ return mPackageManagerInternal.getSuspendedPackageLauncherExtras(packageName, userId);
}
@Override