diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 12:13:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 12:13:32 +0000 |
| commit | 90dc909c3aa3d3ea4d80957996f40b5b6e9fd211 (patch) | |
| tree | ee0f777c57ec324bb9e33654df238f0845613412 /telecomm/java/android/telecom/ParcelableCall.java | |
| parent | 5925057673043828b75663b6158dcdb8d77a8ae2 (diff) | |
| parent | f6253ef4350a8d0f722b54411da48b9489666b14 (diff) | |
Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435
Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a
Diffstat (limited to 'telecomm/java/android/telecom/ParcelableCall.java')
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableCall.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/telecomm/java/android/telecom/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java index be4e2f4c65e1..a234bb0af8fa 100644 --- a/telecomm/java/android/telecom/ParcelableCall.java +++ b/telecomm/java/android/telecom/ParcelableCall.java @@ -16,21 +16,22 @@ package android.telecom; -import android.compat.annotation.UnsupportedAppUsage; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; import android.telecom.Call.Details.CallDirection; -import com.android.internal.telecom.IVideoProvider; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.android.internal.telecom.IVideoProvider; + /** * Information about a call that is used between InCallService and Telecom. * @hide |