Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bc97d1d authored by zachh's avatar zachh Committed by Copybara-Service
Browse files

Added unregisterContentResolvers() to CallLogDataSource and PhoneLookup. 

This is needed to support flag changes which should cause the call log framework to become disabled.

It's not called anywhere yet.

Bug: 74821995
Test: unit
PiperOrigin-RevId: 189761665
Change-Id: I914c690448f03ebacd7d05c9ad082aba7bf1a4ce
parent 4633a7d3

java/com/android/dialer/calllog/datasources/CallLogDataSource.java

+3 −0
Original line number Diff line number Diff line
@@ -105,4 +105,7 @@ public interface CallLogDataSource { 


  @MainThread

  void registerContentObservers(Context appContext);



  @MainThread

  void unregisterContentObservers(Context appContext);

}

java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java

+5 −0
Original line number Diff line number Diff line
@@ -294,6 +294,11 @@ public final class PhoneLookupDataSource implements CallLogDataSource { 
    compositePhoneLookup.registerContentObservers(appContext);

  }



  @Override

  public void unregisterContentObservers(Context appContext) {

    compositePhoneLookup.unregisterContentObservers(appContext);

  }



  private static ImmutableSet<DialerPhoneNumber>

      queryDistinctDialerPhoneNumbersFromAnnotatedCallLog(Context appContext) {

    ImmutableSet.Builder<DialerPhoneNumber> numbers = ImmutableSet.builder();

java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java

+5 −0
Original line number Diff line number Diff line
@@ -119,6 +119,11 @@ public class SystemCallLogDataSource implements CallLogDataSource { 
        .registerContentObserver(VoicemailContract.Status.CONTENT_URI, true, markDirtyObserver);

  }



  @Override

  public void unregisterContentObservers(Context appContext) {

    appContext.getContentResolver().unregisterContentObserver(markDirtyObserver);

  }



  @Override

  public ListenableFuture<Boolean> isDirty(Context appContext) {

    return backgroundExecutorService.submit(() -> isDirtyInternal(appContext));

java/com/android/dialer/calllog/datasources/voicemail/VoicemailDataSource.java

+3 −0
Original line number Diff line number Diff line
@@ -108,4 +108,7 @@ public class VoicemailDataSource implements CallLogDataSource { 


  @Override

  public void registerContentObservers(Context appContext) {}



  @Override

  public void unregisterContentObservers(Context appContext) {}

}

java/com/android/dialer/phonelookup/PhoneLookup.java

+3 −0
Original line number Diff line number Diff line
@@ -85,4 +85,7 @@ public interface PhoneLookup<T> { 


  @MainThread

  void registerContentObservers(Context appContext);



  @MainThread

  void unregisterContentObservers(Context appContext);

}