summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/ParcelableCall.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:31:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:31:41 +0000
commit277353090cbb27a55f4050bf16bc800b0d6f825e (patch)
tree58f0ad9b92d77a7784a409870185e44d0f4e5fe7 /telecomm/java/android/telecom/ParcelableCall.java
parentedd82314a962fccd96981d556994c6e6509afd30 (diff)
parentc7f44bacbe788923177355bd4f82b65414472e45 (diff)
Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe
Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69
Diffstat (limited to 'telecomm/java/android/telecom/ParcelableCall.java')
-rw-r--r--telecomm/java/android/telecom/ParcelableCall.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java
index a234bb0af8fa..be4e2f4c65e1 100644
--- a/telecomm/java/android/telecom/ParcelableCall.java
+++ b/telecomm/java/android/telecom/ParcelableCall.java
@@ -16,22 +16,21 @@
package android.telecom;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.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