Merge "Don't observe unnecessary package intents" into qt-dev
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index 92e92a8..d00c7f1 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -69,6 +69,8 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.google.android.collect.Sets;
+
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -133,13 +135,11 @@
// Information related to when the installed packages should be parsed for building a white and
// black list
- private final List<String> mPackageManagerActions = Arrays.asList(
+ private final Set<String> mPackageManagerActions = Sets.newArraySet(
Intent.ACTION_PACKAGE_ADDED,
Intent.ACTION_PACKAGE_CHANGED,
- Intent.ACTION_PACKAGE_DATA_CLEARED,
Intent.ACTION_PACKAGE_REMOVED,
- Intent.ACTION_PACKAGE_REPLACED,
- Intent.ACTION_PACKAGE_FULLY_REMOVED);
+ Intent.ACTION_PACKAGE_REPLACED);
private final PackageParsingEventReceiver mPackageParsingEventReceiver =
new PackageParsingEventReceiver();
@@ -179,6 +179,7 @@
/**
* int display id of the blocked task.
+ *
* @hide
*/
public static final String BLOCKING_INTENT_EXTRA_DISPLAY_ID = "display_id";
@@ -657,9 +658,9 @@
* - whitelist from resource config;
* - activity declared as Distraction Optimized (D.O.) in manifest;
* - blacklist from resource config - package/activity blacklisted will not exist
- * in returned whitelist.
+ * in returned whitelist.
*
- * @param userId Parse packages installed for user.
+ * @param userId Parse packages installed for user.
* @param configWhitelist Whitelist from config.
* @param configBlacklist Blacklist from config.
*/
@@ -941,7 +942,7 @@
private String dumpPoliciesLocked(boolean dumpAll) {
StringBuilder sb = new StringBuilder();
if (dumpAll) {
- sb.append("**System white list**\n");
+ sb.append("**System whitelist**\n");
for (AppBlockingPackageInfoWrapper wrapper : mActivityWhitelistMap.values()) {
sb.append(wrapper.toString() + "\n");
}
@@ -1091,10 +1092,9 @@
* Creates an intent to start blocking activity.
*
* @param blockingActivity the activity to launch
- * @param blockedActivity the activity being blocked
- * @param blockedTaskId the blocked task id, which contains the blocked activity
+ * @param blockedActivity the activity being blocked
+ * @param blockedTaskId the blocked task id, which contains the blocked activity
* @param taskRootActivity root activity of the blocked task
- *
* @return an intent to launch the blocking activity.
*/
private static Intent createBlockingActivityIntent(ComponentName blockingActivity,
@@ -1121,7 +1121,6 @@
* Enable/Disable activity blocking by correspondingly enabling/disabling broadcasting UXR
* changes in {@link CarUxRestrictionsManagerService}. This is only available in
* engineering builds for development convenience.
- *
*/
@Override
public synchronized void setEnableActivityBlocking(boolean enable) {
@@ -1451,7 +1450,7 @@
}
private boolean isPackageManagerAction(String action) {
- return mPackageManagerActions.indexOf(action) != -1;
+ return mPackageManagerActions.contains(action);
}
/**