diff options
author | Mathew Inwood <mathewi@google.com> | 2018-08-06 09:47:13 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-06 09:47:13 -0700 |
commit | ec3f7c80ce1da083ec66fa6cfbbab9547e9cb579 (patch) | |
tree | 594d668cea0a997b668fd9c72c74b0d351d0a352 | |
parent | 230017d9b9c33495d6b2981925fb36cb16bf501f (diff) | |
parent | 44091cdb47f5cdc9020a19645a4ef81e7ed9205a (diff) | |
download | base-ec3f7c80ce1da083ec66fa6cfbbab9547e9cb579.tar.gz |
Merge "Add @UnsupportedAppUsage annotations"
am: 44091cdb47
Change-Id: I1dfae6f3d8ba8d5ff63f378c71f9670199a3adc3
-rw-r--r-- | config/hiddenapi-light-greylist.txt | 20 | ||||
-rw-r--r-- | config/hiddenapi-vendor-list.txt | 7 | ||||
-rw-r--r-- | telecomm/java/android/telecom/AudioState.java | 4 | ||||
-rw-r--r-- | telecomm/java/android/telecom/Call.java | 2 | ||||
-rw-r--r-- | telecomm/java/android/telecom/Connection.java | 2 | ||||
-rw-r--r-- | telecomm/java/android/telecom/ParcelableCall.java | 6 | ||||
-rw-r--r-- | telecomm/java/android/telecom/Phone.java | 3 | ||||
-rw-r--r-- | telecomm/java/android/telecom/PhoneAccountHandle.java | 4 | ||||
-rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 11 | ||||
-rw-r--r-- | telecomm/java/android/telecom/VideoCallImpl.java | 2 | ||||
-rw-r--r-- | telecomm/java/android/telecom/VideoProfile.java | 2 |
11 files changed, 36 insertions, 27 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 92813acd29a7..4721e4d9f864 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -4482,26 +4482,6 @@ Landroid/system/OsConstants;->XATTR_CREATE:I Landroid/system/OsConstants;->XATTR_REPLACE:I Landroid/system/OsConstants;->_LINUX_CAPABILITY_VERSION_3:I Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval; -Landroid/telecom/AudioState;->isMuted:Z -Landroid/telecom/AudioState;->route:I -Landroid/telecom/AudioState;->supportedRouteMask:I -Landroid/telecom/Call$Details;->CAPABILITY_CAN_UPGRADE_TO_VIDEO:I -Landroid/telecom/Connection$VideoProvider;-><init>(Landroid/os/Looper;)V -Landroid/telecom/Phone;->setProximitySensorOff(Z)V -Landroid/telecom/Phone;->setProximitySensorOn()V -Landroid/telecom/PhoneAccountHandle;-><init>(Landroid/os/Parcel;)V -Landroid/telecom/PhoneAccountHandle;->mComponentName:Landroid/content/ComponentName; -Landroid/telecom/PhoneAccountHandle;->mId:Ljava/lang/String; -Landroid/telecom/TelecomManager;->EXTRA_IS_HANDOVER:Ljava/lang/String; -Landroid/telecom/TelecomManager;->getCallCapablePhoneAccounts(Z)Ljava/util/List; -Landroid/telecom/TelecomManager;->getCurrentTtyMode()I -Landroid/telecom/TelecomManager;->getSimCallManager(I)Landroid/telecom/PhoneAccountHandle; -Landroid/telecom/TelecomManager;->getSystemDialerPackage()Ljava/lang/String; -Landroid/telecom/TelecomManager;->getUserSelectedOutgoingPhoneAccount()Landroid/telecom/PhoneAccountHandle; -Landroid/telecom/TelecomManager;->setDefaultDialer(Ljava/lang/String;)Z -Landroid/telecom/TelecomManager;->setUserSelectedOutgoingPhoneAccount(Landroid/telecom/PhoneAccountHandle;)V -Landroid/telecom/TelecomManager;->TTY_MODE_OFF:I -Landroid/telecom/VideoCallImpl;->destroy()V Landroid/telephony/CarrierConfigManager;->KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY:Ljava/lang/String; Landroid/telephony/CarrierConfigManager;->KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL:Ljava/lang/String; Landroid/telephony/CarrierMessagingServiceManager;-><init>()V diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt index 666fa731e0fc..64d7a5bcd221 100644 --- a/config/hiddenapi-vendor-list.txt +++ b/config/hiddenapi-vendor-list.txt @@ -396,13 +396,6 @@ Landroid/system/Os;->setsockoptIfreq(Ljava/io/FileDescriptor;IILjava/lang/String Landroid/system/Os;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V Landroid/system/PacketSocketAddress;-><init>(I[B)V Landroid/system/PacketSocketAddress;-><init>(SI)V -Landroid/telecom/ParcelableCall;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/telecom/ParcelableCall;->getConnectTimeMillis()J -Landroid/telecom/ParcelableCall;->getDisconnectCause()Landroid/telecom/DisconnectCause; -Landroid/telecom/ParcelableCall;->getHandle()Landroid/net/Uri; -Landroid/telecom/ParcelableCall;->getId()Ljava/lang/String; -Landroid/telecom/TelecomManager;->from(Landroid/content/Context;)Landroid/telecom/TelecomManager; -Landroid/telecom/VideoProfile$CameraCapabilities;-><init>(IIZF)V Landroid/telephony/euicc/DownloadableSubscription;->encodedActivationCode:Ljava/lang/String; Landroid/telephony/euicc/DownloadableSubscription;->setAccessRules([Landroid/telephony/UiccAccessRule;)V Landroid/telephony/euicc/DownloadableSubscription;->setCarrierName(Ljava/lang/String;)V diff --git a/telecomm/java/android/telecom/AudioState.java b/telecomm/java/android/telecom/AudioState.java index 33013ac07a3c..eb202a798568 100644 --- a/telecomm/java/android/telecom/AudioState.java +++ b/telecomm/java/android/telecom/AudioState.java @@ -17,6 +17,7 @@ package android.telecom; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -53,8 +54,11 @@ public class AudioState implements Parcelable { private static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET | ROUTE_SPEAKER; + @UnsupportedAppUsage private final boolean isMuted; + @UnsupportedAppUsage private final int route; + @UnsupportedAppUsage private final int supportedRouteMask; public AudioState(boolean muted, int route, int supportedRouteMask) { diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 1c0e260bef5f..096cf37d4c65 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -19,6 +19,7 @@ package android.telecom; import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -308,6 +309,7 @@ public final class Call { * Call can be upgraded to a video call. * @hide */ + @UnsupportedAppUsage public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 0x00080000; /** diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index fa4b011b55d8..5d5b15d346d3 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -23,6 +23,7 @@ import com.android.internal.telecom.IVideoProvider; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.app.Notification; import android.bluetooth.BluetoothDevice; import android.content.Intent; @@ -1274,6 +1275,7 @@ public abstract class Connection extends Conferenceable { * @param looper The looper. * @hide */ + @UnsupportedAppUsage public VideoProvider(Looper looper) { mBinder = new VideoProvider.VideoProviderBinder(); mMessageHandler = new VideoProvider.VideoProviderHandler(looper); diff --git a/telecomm/java/android/telecom/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java index 6212a77feba8..8b0211e4b991 100644 --- a/telecomm/java/android/telecom/ParcelableCall.java +++ b/telecomm/java/android/telecom/ParcelableCall.java @@ -16,6 +16,7 @@ package android.telecom; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Bundle; import android.os.Parcel; @@ -117,6 +118,7 @@ public final class ParcelableCall implements Parcelable { } /** The unique ID of the call. */ + @UnsupportedAppUsage public String getId() { return mId; } @@ -130,6 +132,7 @@ public final class ParcelableCall implements Parcelable { * Reason for disconnection, as described by {@link android.telecomm.DisconnectCause}. Valid * when call state is {@link CallState#DISCONNECTED}. */ + @UnsupportedAppUsage public DisconnectCause getDisconnectCause() { return mDisconnectCause; } @@ -155,11 +158,13 @@ public final class ParcelableCall implements Parcelable { } /** The time that the call switched to the active state. */ + @UnsupportedAppUsage public long getConnectTimeMillis() { return mConnectTimeMillis; } /** The endpoint to which the call is connected. */ + @UnsupportedAppUsage public Uri getHandle() { return mHandle; } @@ -300,6 +305,7 @@ public final class ParcelableCall implements Parcelable { } /** Responsible for creating ParcelableCall objects for deserialized Parcels. */ + @UnsupportedAppUsage public static final Parcelable.Creator<ParcelableCall> CREATOR = new Parcelable.Creator<ParcelableCall> () { @Override diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java index 99f94f28b6d3..d3ccd2cadbf5 100644 --- a/telecomm/java/android/telecom/Phone.java +++ b/telecomm/java/android/telecom/Phone.java @@ -17,6 +17,7 @@ package android.telecom; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.RemoteException; @@ -330,6 +331,7 @@ public final class Phone { * * @hide */ + @UnsupportedAppUsage public final void setProximitySensorOn() { mInCallAdapter.turnProximitySensorOn(); } @@ -345,6 +347,7 @@ public final class Phone { * * @hide */ + @UnsupportedAppUsage public final void setProximitySensorOff(boolean screenOnImmediately) { mInCallAdapter.turnProximitySensorOff(screenOnImmediately); } diff --git a/telecomm/java/android/telecom/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java index 77b510df8ff8..279804e6aa30 100644 --- a/telecomm/java/android/telecom/PhoneAccountHandle.java +++ b/telecomm/java/android/telecom/PhoneAccountHandle.java @@ -17,6 +17,7 @@ package android.telecom; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +41,9 @@ import java.util.Objects; * See {@link PhoneAccount}, {@link TelecomManager}. */ public final class PhoneAccountHandle implements Parcelable { + @UnsupportedAppUsage private final ComponentName mComponentName; + @UnsupportedAppUsage private final String mId; private final UserHandle mUserHandle; @@ -164,6 +167,7 @@ public final class PhoneAccountHandle implements Parcelable { } }; + @UnsupportedAppUsage private PhoneAccountHandle(Parcel in) { this(ComponentName.CREATOR.createFromParcel(in), in.readString(), diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 75572b30d808..48c1e24db1f3 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -20,6 +20,7 @@ import android.annotation.SuppressAutoDoc; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -376,6 +377,7 @@ public class TelecomManager { * The phone number of the call used by Telecom to determine which call should be handed over. * @hide */ + @UnsupportedAppUsage public static final String EXTRA_IS_HANDOVER = "android.telecom.extra.IS_HANDOVER"; /** @@ -493,6 +495,7 @@ public class TelecomManager { * * @hide */ + @UnsupportedAppUsage public static final int TTY_MODE_OFF = 0; /** @@ -652,6 +655,7 @@ public class TelecomManager { /** * @hide */ + @UnsupportedAppUsage public static TelecomManager from(Context context) { return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); } @@ -721,6 +725,7 @@ public class TelecomManager { * @return The user outgoing phone account selected by the user. * @hide */ + @UnsupportedAppUsage public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() { try { if (isServiceConnected()) { @@ -736,6 +741,7 @@ public class TelecomManager { * Sets the user-chosen default for making outgoing phone calls. * @hide */ + @UnsupportedAppUsage public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) { try { if (isServiceConnected()) { @@ -773,6 +779,7 @@ public class TelecomManager { * * @hide */ + @UnsupportedAppUsage public PhoneAccountHandle getSimCallManager(int userId) { try { if (isServiceConnected()) { @@ -876,6 +883,7 @@ public class TelecomManager { * @return A list of {@code PhoneAccountHandle} objects. * @hide */ + @UnsupportedAppUsage public List<PhoneAccountHandle> getCallCapablePhoneAccounts(boolean includeDisabledAccounts) { try { if (isServiceConnected()) { @@ -1109,6 +1117,7 @@ public class TelecomManager { * * @hide */ + @UnsupportedAppUsage public boolean setDefaultDialer(String packageName) { try { if (isServiceConnected()) { @@ -1126,6 +1135,7 @@ public class TelecomManager { * @return package name for the system dialer package or null if no system dialer is preloaded. * @hide */ + @UnsupportedAppUsage public String getSystemDialerPackage() { try { if (isServiceConnected()) { @@ -1413,6 +1423,7 @@ public class TelecomManager { * - {@link TelecomManager#TTY_MODE_VCO} * @hide */ + @UnsupportedAppUsage public int getCurrentTtyMode() { try { if (isServiceConnected()) { diff --git a/telecomm/java/android/telecom/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java index bae58ff852d4..2c7fecb5e3c4 100644 --- a/telecomm/java/android/telecom/VideoCallImpl.java +++ b/telecomm/java/android/telecom/VideoCallImpl.java @@ -16,6 +16,7 @@ package android.telecom; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Handler; import android.os.IBinder; @@ -217,6 +218,7 @@ public class VideoCallImpl extends VideoCall { mTargetSdkVersion = sdkVersion; } + @UnsupportedAppUsage public void destroy() { unregisterCallback(mCallback); } diff --git a/telecomm/java/android/telecom/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java index 90ed36f19dbf..bbac8eb88aec 100644 --- a/telecomm/java/android/telecom/VideoProfile.java +++ b/telecomm/java/android/telecom/VideoProfile.java @@ -17,6 +17,7 @@ package android.telecom; import android.annotation.IntDef; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -377,6 +378,7 @@ public class VideoProfile implements Parcelable { * @param maxZoom Maximum zoom supported by camera. * @hide */ + @UnsupportedAppUsage public CameraCapabilities(int width, int height, boolean zoomSupported, float maxZoom) { mWidth = width; mHeight = height; |