diff options
author | zachh <zachh@google.com> | 2018-03-21 15:03:30 -0700 |
---|---|---|
committer | Weijia Xu <weijiaxu@google.com> | 2018-03-22 11:50:51 -0700 |
commit | 636578906c1ae45a5514059afd8279277c106b9b (patch) | |
tree | 508c63eaaa1f76a367d2fab1066ca09a90a1ffcf /java/com/android/dialer/phonelookup | |
parent | 5ce3454474166275abfd96e54b1b12d4d54532e5 (diff) |
Removed appContext from CallLogDataSource and PhoneLookup.
Impls can access appContext via dagger.
Test: existing
PiperOrigin-RevId: 189974157
Change-Id: Ie64d2c6f9ba08fc914d3c31f7e014c2beef3ab00
Diffstat (limited to 'java/com/android/dialer/phonelookup')
7 files changed, 18 insertions, 21 deletions
diff --git a/java/com/android/dialer/phonelookup/PhoneLookup.java b/java/com/android/dialer/phonelookup/PhoneLookup.java index d4a1ddfbd..d11f023af 100644 --- a/java/com/android/dialer/phonelookup/PhoneLookup.java +++ b/java/com/android/dialer/phonelookup/PhoneLookup.java @@ -16,7 +16,6 @@ package com.android.dialer.phonelookup; -import android.content.Context; import android.support.annotation.MainThread; import com.android.dialer.DialerPhoneNumber; import com.google.common.collect.ImmutableMap; @@ -84,10 +83,10 @@ public interface PhoneLookup<T> { ListenableFuture<Void> onSuccessfulBulkUpdate(); @MainThread - void registerContentObservers(Context appContext); + void registerContentObservers(); @MainThread - void unregisterContentObservers(Context appContext); + void unregisterContentObservers(); /** * Clear any data written by this lookup. This is called when the new call log framework has been diff --git a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java index f5a249aed..ce879a995 100644 --- a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java @@ -169,7 +169,7 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB } @Override - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { appContext .getContentResolver() .registerContentObserver( @@ -179,7 +179,7 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB } @Override - public void unregisterContentObservers(Context appContext) { + public void unregisterContentObservers() { appContext.getContentResolver().unregisterContentObserver(markDirtyObserver); } diff --git a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java index e2a90c257..a3d51a78f 100644 --- a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java @@ -170,7 +170,7 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked } @Override - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { if (VERSION.SDK_INT < VERSION_CODES.N) { return; } @@ -183,7 +183,7 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked } @Override - public void unregisterContentObservers(Context appContext) { + public void unregisterContentObservers() { appContext.getContentResolver().unregisterContentObserver(markDirtyObserver); } diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java index 365b21883..7cc7a6d7f 100644 --- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java +++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java @@ -16,7 +16,6 @@ package com.android.dialer.phonelookup.composite; -import android.content.Context; import android.support.annotation.MainThread; import android.support.annotation.VisibleForTesting; import com.android.dialer.DialerPhoneNumber; @@ -214,19 +213,19 @@ public final class CompositePhoneLookup { MoreExecutors.directExecutor()); } - /** Delegates to sub-lookups' {@link PhoneLookup#registerContentObservers(Context)}. */ + /** Delegates to sub-lookups' {@link PhoneLookup#registerContentObservers()}. */ @MainThread - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { for (PhoneLookup phoneLookup : phoneLookups) { - phoneLookup.registerContentObservers(appContext); + phoneLookup.registerContentObservers(); } } - /** Delegates to sub-lookups' {@link PhoneLookup#unregisterContentObservers(Context)}. */ + /** Delegates to sub-lookups' {@link PhoneLookup#unregisterContentObservers()}. */ @MainThread - public void unregisterContentObservers(Context appContext) { + public void unregisterContentObservers() { for (PhoneLookup phoneLookup : phoneLookups) { - phoneLookup.unregisterContentObservers(appContext); + phoneLookup.unregisterContentObservers(); } } diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java index a5b3b7251..902a2fbe3 100644 --- a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java @@ -623,12 +623,12 @@ public final class Cp2DefaultDirectoryPhoneLookup implements PhoneLookup<Cp2Info } @Override - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { // Do nothing since CP2 changes are too noisy. } @Override - public void unregisterContentObservers(Context appContext) {} + public void unregisterContentObservers() {} @Override public ListenableFuture<Void> clearData() { diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java index 9110aa71f..e497989c7 100644 --- a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java @@ -228,14 +228,14 @@ public final class Cp2ExtendedDirectoryPhoneLookup implements PhoneLookup<Cp2Inf } @Override - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { // For contacts in remote directories, no content observer can be registered. // For contacts in local (but not default) directories (e.g., the local work directory), we // don't register a content observer for now. } @Override - public void unregisterContentObservers(Context appContext) {} + public void unregisterContentObservers() {} @Override public ListenableFuture<Void> clearData() { diff --git a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java index 315f65819..6b77036cf 100644 --- a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java @@ -16,7 +16,6 @@ package com.android.dialer.phonelookup.spam; -import android.content.Context; import android.content.SharedPreferences; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; @@ -152,13 +151,13 @@ public final class SpamPhoneLookup implements PhoneLookup<SpamInfo> { } @Override - public void registerContentObservers(Context appContext) { + public void registerContentObservers() { // No content observer can be registered as Spam is not based on a content provider. // Each Spam implementation should be responsible for notifying any data changes. } @Override - public void unregisterContentObservers(Context appContext) {} + public void unregisterContentObservers() {} @Override public ListenableFuture<Void> clearData() { |