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

Commit 89f02cc8 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Restore some greylist entries." into qt-dev am: f76bdce6 

am: 13ffa87a

Change-Id: I4c92e5685804a5b03510ab5b9396c0dc6f4aad46
parents 861c5782 13ffa87a

config/hiddenapi-greylist.txt

+1 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ Landroid/security/keystore/IKeystoreService;->ungrant(Ljava/lang/String;I)I 
Landroid/service/dreams/IDreamManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/dreams/IDreamManager;

Landroid/service/dreams/IDreamManager;->getDreamComponents()[Landroid/content/ComponentName;

Landroid/service/euicc/IEuiccService$Stub;-><init>()V

Landroid/service/media/IMediaBrowserServiceCallbacks$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/media/IMediaBrowserServiceCallbacks;

Landroid/service/notification/INotificationListener$Stub;-><init>()V

Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/persistentdata/IPersistentDataBlockService;

Landroid/service/vr/IVrManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/vr/IVrManager;

core/java/android/app/ApplicationPackageManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,7 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    @UnsupportedAppUsage

    @Override

    public boolean setInstantAppCookie(@NonNull byte[] cookie) {

        try {

core/java/android/bluetooth/BluetoothHearingAid.java

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Binder;

import android.os.IBinder;
@@ -83,6 +84,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -303,6 +305,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

    @UnsupportedAppUsage

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");

        final IBluetoothHearingAid service = getService();
@@ -331,6 +334,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * is not active, it will be null on that position. Returns empty list on error.

     * @hide

     */

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public List<BluetoothDevice> getActiveDevices() {

        if (VDBG) log("getActiveDevices()");

core/java/android/content/om/OverlayInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.UserIdInt;

import android.os.Parcel;

import android.os.Parcelable;
@@ -169,6 +170,7 @@ public final class OverlayInfo implements Parcelable { 
     * The state of this OverlayInfo as defined by the STATE_* constants in this class.

     * @hide

     */

    @UnsupportedAppUsage

    public final @State int state;



    /**

core/java/android/os/UserHandle.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public final class UserHandle implements Parcelable { 
    public static final @NonNull UserHandle CURRENT_OR_SELF = new UserHandle(USER_CURRENT_OR_SELF);



    /** @hide An undefined user id */

    @UnsupportedAppUsage

    public static final @UserIdInt int USER_NULL = -10000;



    /**