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

Merge "Cleanup PM snapshot" into sc-dev

Browse Source
This commit is contained in:
Lee Shombert
2021-03-19 17:51:11 +00:00
committed by Android (Google) Code Review
parent aeee47918a c9be83f359
commit 758971d274
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) {