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

Merge "Fix ClassCastException in WatchedIntentResolver" into sc-dev am: 5677d2e417

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508394

Change-Id: I8a71cd87bde7bd5e89ed2f1ddd1e2b97bddb12de
This commit is contained in:
Lee Shombert
2021-05-14 15:19:50 +00:00
committed by Automerger Merge Worker
parent 269d3adcfa 5677d2e417
commit c14ebdf895
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ package com.android.server.pm;
import android.annotation.NonNull;
import android.content.IntentFilter;
import com.android.server.WatchedIntentResolver;
import com.android.server.utils.Snappable;
import com.android.server.utils.SnapshotCache;

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

@@ -19,7 +19,6 @@ package com.android.server.pm;
import android.annotation.NonNull;
import android.content.IntentFilter;
import com.android.server.WatchedIntentResolver;
import com.android.server.utils.Snappable;
import com.android.server.utils.SnapshotCache;

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

@@ -19,7 +19,6 @@ package com.android.server.pm;
import android.annotation.NonNull;
import android.content.IntentFilter;
import com.android.server.WatchedIntentResolver;
import com.android.server.utils.Snappable;
import com.android.server.utils.SnapshotCache;

23
services/core/java/com/android/server/WatchedIntentResolver.java → services/core/java/com/android/server/pm/WatchedIntentResolver.java
View File

@@ -14,18 +14,20 @@
* limitations under the License.
*/
package com.android.server;
package com.android.server.pm;
import android.annotation.NonNull;
import android.annotation.Nullable;
import com.android.server.pm.WatchedIntentFilter;
import com.android.server.IntentResolver;
import com.android.server.utils.Snappable;
import com.android.server.utils.Watchable;
import com.android.server.utils.WatchableImpl;
import com.android.server.utils.Watcher;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
@@ -34,7 +36,8 @@ import java.util.List;
* @param <R> The resolver type.
* {@hide}
*/
public abstract class WatchedIntentResolver<F extends Watchable, R extends Object>
public abstract class WatchedIntentResolver<F extends WatchedIntentFilter,
R extends WatchedIntentFilter>
extends IntentResolver<F, R>
implements Watchable, Snappable {
@@ -116,11 +119,21 @@ public abstract class WatchedIntentResolver<F extends Watchable, R extends Objec
onChanged();
}
// Sorts a List of IntentFilter objects into descending priority order.
@SuppressWarnings("rawtypes")
private static final Comparator<WatchedIntentFilter> sResolvePrioritySorter =
new Comparator<>() {
public int compare(WatchedIntentFilter o1, WatchedIntentFilter o2) {
final int q1 = o1.getPriority();
final int q2 = o2.getPriority();
return (q1 > q2) ? -1 : ((q1 < q2) ? 1 : 0);
}
};
@Override
@SuppressWarnings("unchecked")
protected void sortResults(List<R> results) {
super.sortResults(results);
onChanged();
Collections.sort(results, sResolvePrioritySorter);
}
/**