Move registered slice set from settings to settingslib.

Bug: 121150258
Test: robotests
Change-Id: I32263de9a755e8902c820fda36096b821a293bcb
This commit is contained in:
Fan Zhang
2019-02-14 14:31:11 -08:00
parent ed2db4aaa1
commit 1031901867

View File

@@ -129,8 +129,6 @@ public class SettingsSliceProvider extends SliceProvider {
@VisibleForTesting @VisibleForTesting
Map<Uri, SliceData> mSliceDataCache; Map<Uri, SliceData> mSliceDataCache;
final Set<Uri> mRegisteredUris = new ArraySet<>();
final Map<Uri, SliceBackgroundWorker> mPinnedWorkers = new ArrayMap<>(); final Map<Uri, SliceBackgroundWorker> mPinnedWorkers = new ArrayMap<>();
public SettingsSliceProvider() { public SettingsSliceProvider() {
@@ -173,14 +171,8 @@ public class SettingsSliceProvider extends SliceProvider {
@Override @Override
public void onSliceUnpinned(Uri sliceUri) { public void onSliceUnpinned(Uri sliceUri) {
if (mRegisteredUris.contains(sliceUri)) { SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
Log.d(TAG, "Unregistering uri broadcast relay: " + sliceUri); ThreadUtils.postOnMainThread(() -> stopBackgroundWorker(sliceUri));
SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
mRegisteredUris.remove(sliceUri);
}
ThreadUtils.postOnMainThread(() -> {
stopBackgroundWorker(sliceUri);
});
mSliceDataCache.remove(sliceUri); mSliceDataCache.remove(sliceUri);
} }
@@ -462,8 +454,6 @@ public class SettingsSliceProvider extends SliceProvider {
* {@param intentFilter} happen. * {@param intentFilter} happen.
*/ */
void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) { void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) {
Log.d(TAG, "Registering Uri for broadcast relay: " + sliceUri);
mRegisteredUris.add(sliceUri);
SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceRelayReceiver.class, SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceRelayReceiver.class,
intentFilter); intentFilter);
} }