Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup PM snapshot

Browse Source 
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
This commit is contained in:
Lee Shombert
2021-03-17 11:41:47 -07:00
parent 6681a15237
commit c9be83f359
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/WatchableIntentResolver.java → services/core/java/com/android/server/WatchedIntentResolver.java
View File

@@ -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 {

4
services/core/java/com/android/server/pm/CrossProfileIntentResolver.java
View File

@@ -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) {

4
services/core/java/com/android/server/pm/PersistentPreferredIntentResolver.java
View File

@@ -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) {

4
services/core/java/com/android/server/pm/PreferredIntentResolver.java
View File

@@ -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) {