From c9be83f359897e880f50d02ad15eb07f44bb2b33 Mon Sep 17 00:00:00 2001
From: Lee Shombert <shombert@google.com>
Date: Wed, 17 Mar 2021 11:41:47 -0700
Subject: [PATCH] Cleanup PM snapshot

Bug: 181964615

Clean up some of the code that was added in support of the PM snapshot
feature. WatchableIntentResolver is renamed to WatchedIntentResolver, to
mimic the naming convention used everywhere else.

This is a non-functional change in preparation for further commits
against this bug.

Test: atest
 * FrameworksServicesTests:AppsFilterTest
 * FrameworksServicesTests:PackageInstallerSessionTest
 * FrameworksServicesTests:PackageManagerServiceTest
 * FrameworksServicesTests:PackageManagerSettingsTests
 * FrameworksServicesTests:ScanTests
 * FrameworksServicesTests:UserSystemPackageInstallerTest
 * PackageManagerServiceBootTest
 * UserLifecycleTests#startUser
 * UserLifecycleTests#stopUser
 * UserLifecycleTests#switchUser
 * android.appsecurity.cts.EphemeralTest
 * android.appsecurity.cts.InstantAppUserTest
 * FrameworksServicesTests:WatcherTest
 * CtsContentTestCases:IntentFilterTest

Change-Id: Ie4fc20bdcfce44adf9ec3bec8f0a36abee6db979
---
 ...atchableIntentResolver.java => WatchedIntentResolver.java} | 2 +-
 .../com/android/server/pm/CrossProfileIntentResolver.java     | 4 ++--
 .../android/server/pm/PersistentPreferredIntentResolver.java  | 4 ++--
 .../java/com/android/server/pm/PreferredIntentResolver.java   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename services/core/java/com/android/server/{WatchableIntentResolver.java => WatchedIntentResolver.java} (97%)

diff --git a/services/core/java/com/android/server/WatchableIntentResolver.java b/services/core/java/com/android/server/WatchedIntentResolver.java
similarity index 97%
rename from services/core/java/com/android/server/WatchableIntentResolver.java
rename to services/core/java/com/android/server/WatchedIntentResolver.java
index 2ef94f17e5d94..e514f3c6fd59e 100644
--- a/services/core/java/com/android/server/WatchableIntentResolver.java
+++ b/services/core/java/com/android/server/WatchedIntentResolver.java
@@ -31,7 +31,7 @@ import java.util.List;
  * @param <R> The resolver type.
  * {@hide}
  */
-public abstract class WatchableIntentResolver<F, R extends Object>
+public abstract class WatchedIntentResolver<F, R extends Object>
         extends IntentResolver<F, R>
         implements Watchable {
 
diff --git a/services/core/java/com/android/server/pm/CrossProfileIntentResolver.java b/services/core/java/com/android/server/pm/CrossProfileIntentResolver.java
index aae6ce46de667..791a1057d112a 100644
--- a/services/core/java/com/android/server/pm/CrossProfileIntentResolver.java
+++ b/services/core/java/com/android/server/pm/CrossProfileIntentResolver.java
@@ -19,7 +19,7 @@ package com.android.server.pm;
 import android.annotation.NonNull;
 import android.content.IntentFilter;
 
-import com.android.server.WatchableIntentResolver;
+import com.android.server.WatchedIntentResolver;
 import com.android.server.utils.Snappable;
 
 import java.util.List;
@@ -28,7 +28,7 @@ import java.util.List;
  * Used to find a list of {@link CrossProfileIntentFilter}s that match an intent.
  */
 class CrossProfileIntentResolver
-        extends WatchableIntentResolver<CrossProfileIntentFilter, CrossProfileIntentFilter>
+        extends WatchedIntentResolver<CrossProfileIntentFilter, CrossProfileIntentFilter>
         implements Snappable {
     @Override
     protected CrossProfileIntentFilter[] newArray(int size) {
diff --git a/services/core/java/com/android/server/pm/PersistentPreferredIntentResolver.java b/services/core/java/com/android/server/pm/PersistentPreferredIntentResolver.java
index c1bfcac507729..2b11a42978354 100644
--- a/services/core/java/com/android/server/pm/PersistentPreferredIntentResolver.java
+++ b/services/core/java/com/android/server/pm/PersistentPreferredIntentResolver.java
@@ -19,11 +19,11 @@ package com.android.server.pm;
 import android.annotation.NonNull;
 import android.content.IntentFilter;
 
-import com.android.server.WatchableIntentResolver;
+import com.android.server.WatchedIntentResolver;
 import com.android.server.utils.Snappable;
 
 public class PersistentPreferredIntentResolver
-        extends WatchableIntentResolver<PersistentPreferredActivity, PersistentPreferredActivity>
+        extends WatchedIntentResolver<PersistentPreferredActivity, PersistentPreferredActivity>
         implements Snappable {
     @Override
     protected PersistentPreferredActivity[] newArray(int size) {
diff --git a/services/core/java/com/android/server/pm/PreferredIntentResolver.java b/services/core/java/com/android/server/pm/PreferredIntentResolver.java
index 0e3b85ca677a6..10a6b3f69fde2 100644
--- a/services/core/java/com/android/server/pm/PreferredIntentResolver.java
+++ b/services/core/java/com/android/server/pm/PreferredIntentResolver.java
@@ -19,14 +19,14 @@ package com.android.server.pm;
 import android.annotation.NonNull;
 import android.content.IntentFilter;
 
-import com.android.server.WatchableIntentResolver;
+import com.android.server.WatchedIntentResolver;
 import com.android.server.utils.Snappable;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
 public class PreferredIntentResolver
-        extends WatchableIntentResolver<PreferredActivity, PreferredActivity>
+        extends WatchedIntentResolver<PreferredActivity, PreferredActivity>
         implements Snappable {
     @Override
     protected PreferredActivity[] newArray(int size) {