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

Commit 9eb284c6 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations" am: 44091cdb 

am: ec3f7c80

Change-Id: I50594b690a776145e4b0278e1e0685c5ebc53832
parents f8397b2d ec3f7c80

config/hiddenapi-light-greylist.txt

+0 −20
Original line number Diff line number Diff line
@@ -4484,26 +4484,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

config/hiddenapi-vendor-list.txt

+0 −7
Original line number Diff line number Diff line
@@ -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

telecomm/java/android/telecom/AudioState.java

+4 −0
Original line number Diff line number Diff line
@@ -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) {

telecomm/java/android/telecom/Call.java

+2 −0
Original line number Diff line number Diff line
@@ -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;



        /**

telecomm/java/android/telecom/Connection.java

+2 −0
Original line number Diff line number Diff line
@@ -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;
@@ -1280,6 +1281,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);