diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-22 20:20:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-22 20:20:35 +0000 |
commit | 2aea5b1df52c9f15e551006a46743e792b71cb51 (patch) | |
tree | 10a2be8052ba1ecf4b8ac94d31898dec7df2ada5 /java/com/android/dialer/phonelookup/cp2 | |
parent | 6c64810275484ecc554e1e7ab0e0759c01640fe0 (diff) | |
parent | deb440005181e1d18785e2474192142cf1681d54 (diff) |
Merge changes I31e744f3,Ie64d2c6f
* changes:
Use SwitchPreferenceWithClickableSummary instead of SwitchPreference for VM Donation
Removed appContext from CallLogDataSource and PhoneLookup.
Diffstat (limited to 'java/com/android/dialer/phonelookup/cp2')
-rw-r--r-- | java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java | 4 | ||||
-rw-r--r-- | java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java | 4 |
2 files changed, 4 insertions, 4 deletions
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() { |