Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098 Change-Id: I7c989c4fe62e31ab88b09c8240ff0379bc33bd3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -16,8 +16,6 @@
|
|||||||
|
|
||||||
package com.android.settings.applications;
|
package com.android.settings.applications;
|
||||||
|
|
||||||
import static android.content.pm.PackageManager.GET_ACTIVITIES;
|
|
||||||
|
|
||||||
import static com.android.settings.Utils.PROPERTY_CLONED_APPS_ENABLED;
|
import static com.android.settings.Utils.PROPERTY_CLONED_APPS_ENABLED;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -87,8 +85,8 @@ public class ClonedAppsPreferenceController extends BasePreferenceController
|
|||||||
mContext.getResources().getStringArray(
|
mContext.getResources().getStringArray(
|
||||||
com.android.internal.R.array.cloneable_apps));
|
com.android.internal.R.array.cloneable_apps));
|
||||||
List<String> primaryUserApps = mContext.getPackageManager()
|
List<String> primaryUserApps = mContext.getPackageManager()
|
||||||
.getInstalledPackagesAsUser(GET_ACTIVITIES,
|
.getInstalledPackagesAsUser(/* flags*/ 0, UserHandle.myUserId()).stream()
|
||||||
UserHandle.myUserId()).stream().map(x -> x.packageName).toList();
|
.map(x -> x.packageName).toList();
|
||||||
// Count number of installed apps in system user.
|
// Count number of installed apps in system user.
|
||||||
int availableAppsCount = (int) cloneableApps.stream()
|
int availableAppsCount = (int) cloneableApps.stream()
|
||||||
.filter(x -> primaryUserApps.contains(x)).count();
|
.filter(x -> primaryUserApps.contains(x)).count();
|
||||||
@@ -99,8 +97,8 @@ public class ClonedAppsPreferenceController extends BasePreferenceController
|
|||||||
}
|
}
|
||||||
// Get all apps in clone profile if present.
|
// Get all apps in clone profile if present.
|
||||||
List<String> cloneProfileApps = mContext.getPackageManager()
|
List<String> cloneProfileApps = mContext.getPackageManager()
|
||||||
.getInstalledPackagesAsUser(GET_ACTIVITIES,
|
.getInstalledPackagesAsUser(/* flags*/ 0, cloneUserId).stream()
|
||||||
cloneUserId).stream().map(x -> x.packageName).toList();
|
.map(x -> x.packageName).toList();
|
||||||
// Count number of allowlisted app present in clone profile.
|
// Count number of allowlisted app present in clone profile.
|
||||||
int clonedAppsCount = (int) cloneableApps.stream()
|
int clonedAppsCount = (int) cloneableApps.stream()
|
||||||
.filter(x -> cloneProfileApps.contains(x)).count();
|
.filter(x -> cloneProfileApps.contains(x)).count();
|
||||||
|
Reference in New Issue
Block a user