diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-24 09:31:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-27 08:56:19 -0700 |
commit | 9050823ccf6f512e06ad65c8a741cb17cbc4a833 (patch) | |
tree | e454c9e0fa20b8384fa87d4e6309bb8b9e3aa2a4 /java/com/android/dialer/enrichedcall/EnrichedCallManager.java | |
parent | dd9d50805f1b49dff1fe3787740393d726124cdb (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/151128062
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150756069 (3/21/2017) to cl/151128062 (3/24/2017).
Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Bug: 33210202 36511925
Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk
Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae
Diffstat (limited to 'java/com/android/dialer/enrichedcall/EnrichedCallManager.java')
-rw-r--r-- | java/com/android/dialer/enrichedcall/EnrichedCallManager.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java index a36b2cc0d..978fb1346 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java @@ -20,7 +20,6 @@ import android.support.annotation.IntDef; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; import com.android.dialer.calldetails.nano.CallDetailsEntries; import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult; @@ -184,14 +183,23 @@ public interface EnrichedCallManager { Session getSession(long sessionId); /** - * Returns a mapping of enriched call data for all of the given {@link CallDetailsEntries}. + * Starts an asynchronous process to get all historical data for the given number and set of + * {@link CallDetailsEntries}. + */ + @MainThread + void requestAllHistoricalData(@NonNull String number, @NonNull CallDetailsEntries entries); + + /** + * Returns a mapping of enriched call data for all of the given {@link CallDetailsEntries}, which + * should not be modified. A {@code null} return indicates that clients should call {@link + * #requestAllHistoricalData(String, CallDetailsEntries)}. * * <p>The mapping is created by finding the HistoryResults whose timestamps occurred during or * close after a CallDetailsEntry. A CallDetailsEntry can have multiple HistoryResults in the * event that both a CallComposer message and PostCall message were sent for the same call. */ - @WorkerThread - @NonNull + @Nullable + @MainThread Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData( @NonNull String number, @NonNull CallDetailsEntries entries); @@ -295,12 +303,4 @@ public interface EnrichedCallManager { */ @MainThread void endVideoShareSession(long sessionId); - - /** - * Returns the {@link VideoShareSession} for the given sessionId, or {@code null} if no session - * exists. - */ - @MainThread - @Nullable - VideoShareSession getVideoShareSession(long sessionId); } |