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

Commit 580f86d8 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

resolve merge conflicts of 92b78539 to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I71a17fa603fcd2339bfca54f9e5a7740bc54972f
parents 53469616 92b78539

config/hiddenapi-light-greylist.txt

+0 −38
Original line number Diff line number Diff line
@@ -3468,29 +3468,6 @@ Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator; 
Landroid/net/wifi/WifiSsid;->getOctets()[B

Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;

Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;

Landroid/nfc/cardemulation/AidGroup;-><init>(Ljava/lang/String;Ljava/lang/String;)V

Landroid/nfc/cardemulation/AidGroup;->aids:Ljava/util/List;

Landroid/nfc/cardemulation/AidGroup;->category:Ljava/lang/String;

Landroid/nfc/cardemulation/AidGroup;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Landroid/nfc/cardemulation/AidGroup;

Landroid/nfc/cardemulation/AidGroup;->CREATOR:Landroid/os/Parcelable$Creator;

Landroid/nfc/cardemulation/AidGroup;->description:Ljava/lang/String;

Landroid/nfc/cardemulation/AidGroup;->getAids()Ljava/util/List;

Landroid/nfc/cardemulation/AidGroup;->getCategory()Ljava/lang/String;

Landroid/nfc/cardemulation/AidGroup;->writeAsXml(Lorg/xmlpull/v1/XmlSerializer;)V

Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/PackageManager;Landroid/content/pm/ResolveInfo;Z)V

Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/ResolveInfo;ZLjava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;ZIILjava/lang/String;)V

Landroid/nfc/cardemulation/ApduServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;

Landroid/nfc/cardemulation/ApduServiceInfo;->getDescription()Ljava/lang/String;

Landroid/nfc/cardemulation/ApduServiceInfo;->getSettingsActivityName()Ljava/lang/String;

Landroid/nfc/cardemulation/ApduServiceInfo;->getUid()I

Landroid/nfc/cardemulation/ApduServiceInfo;->isOnHost()Z

Landroid/nfc/cardemulation/ApduServiceInfo;->loadBanner(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;

Landroid/nfc/cardemulation/ApduServiceInfo;->mDynamicAidGroups:Ljava/util/HashMap;

Landroid/nfc/cardemulation/ApduServiceInfo;->mService:Landroid/content/pm/ResolveInfo;

Landroid/nfc/cardemulation/ApduServiceInfo;->mStaticAidGroups:Ljava/util/HashMap;

Landroid/nfc/cardemulation/ApduServiceInfo;->requiresUnlock()Z

Landroid/nfc/ErrorCodes;->isError(I)Z

Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I

Landroid/nfc/INfcAdapterExtras;->authenticate(Ljava/lang/String;[B)V

Landroid/nfc/INfcAdapterExtras;->close(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;

Landroid/nfc/INfcAdapterExtras;->getCardEmulationRoute(Ljava/lang/String;)I
@@ -3498,21 +3475,6 @@ Landroid/nfc/INfcAdapterExtras;->getDriverName(Ljava/lang/String;)Ljava/lang/Str 
Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;

Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V

Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle;

Landroid/nfc/NdefRecord;->mId:[B

Landroid/nfc/NfcActivityManager;->mAdapter:Landroid/nfc/NfcAdapter;

Landroid/nfc/NfcAdapter;->attemptDeadServiceRecovery(Ljava/lang/Exception;)V

Landroid/nfc/NfcAdapter;->getAdapterState()I

Landroid/nfc/NfcAdapter;->getContext()Landroid/content/Context;

Landroid/nfc/NfcAdapter;->getDefaultAdapter()Landroid/nfc/NfcAdapter;

Landroid/nfc/NfcAdapter;->getNfcAdapter(Landroid/content/Context;)Landroid/nfc/NfcAdapter;

Landroid/nfc/NfcAdapter;->getNfcAdapterExtrasInterface()Landroid/nfc/INfcAdapterExtras;

Landroid/nfc/NfcAdapter;->getService()Landroid/nfc/INfcAdapter;

Landroid/nfc/NfcAdapter;->setNdefPushMessageCallback(Landroid/nfc/NfcAdapter$CreateNdefMessageCallback;Landroid/app/Activity;I)V

Landroid/nfc/NfcAdapter;->sService:Landroid/nfc/INfcAdapter;

Landroid/nfc/NfcManager;-><init>(Landroid/content/Context;)V

Landroid/nfc/Tag;->getServiceHandle()I

Landroid/nfc/Tag;->getTagService()Landroid/nfc/INfcTag;

Landroid/nfc/Tag;->mId:[B

Landroid/opengl/EGL14;->eglGetDisplay(J)Landroid/opengl/EGLDisplay;

Landroid/opengl/GLES20;->glGetActiveAttrib(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V

Landroid/opengl/GLES20;->glGetActiveUniform(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V

core/java/android/nfc/ErrorCodes.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;



/**

 * This class defines all the error codes that can be returned by the service

 * and producing an exception on the application level. These are needed since
@@ -25,6 +27,7 @@ package android.nfc; 
 */

public class ErrorCodes {



    @UnsupportedAppUsage

    public static boolean isError(int code) {

        if (code < 0) {

            return true;

core/java/android/nfc/NdefRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;

import android.content.Intent;

import android.net.Uri;

import android.os.Parcel;
@@ -279,6 +280,7 @@ public final class NdefRecord implements Parcelable { 


    private final short mTnf;

    private final byte[] mType;

    @UnsupportedAppUsage

    private final byte[] mId;

    private final byte[] mPayload;

core/java/android/nfc/NfcActivityManager.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.Application;

import android.content.ContentProvider;
@@ -45,6 +46,7 @@ public final class NfcActivityManager extends IAppCallback.Stub 
    static final String TAG = NfcAdapter.TAG;

    static final Boolean DBG = false;



    @UnsupportedAppUsage

    final NfcAdapter mAdapter;



    // All objects in the lists are protected by this

core/java/android/nfc/NfcAdapter.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.ActivityThread;

import android.app.OnActivityPausedListener;
@@ -325,6 +326,7 @@ public final class NfcAdapter { 
    // Final after first constructor, except for

    // attemptDeadServiceRecovery() when NFC crashes - we accept a best effort

    // recovery

    @UnsupportedAppUsage

    static INfcAdapter sService;

    static INfcTag sTagService;

    static INfcCardEmulation sCardEmulationService;
@@ -490,6 +492,7 @@ public final class NfcAdapter { 
     * or throws if NFC is not available.

     * @hide

     */

    @UnsupportedAppUsage

    public static synchronized NfcAdapter getNfcAdapter(Context context) {

        if (!sIsInitialized) {

            sHasNfcFeature = hasNfcFeature();
@@ -593,6 +596,7 @@ public final class NfcAdapter { 
     * @hide

     */

    @Deprecated

    @UnsupportedAppUsage

    public static NfcAdapter getDefaultAdapter() {

        // introduced in API version 9 (GB 2.3)

        // deprecated in API version 10 (GB 2.3.3)
@@ -615,6 +619,7 @@ public final class NfcAdapter { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public Context getContext() {

        return mContext;

    }
@@ -623,6 +628,7 @@ public final class NfcAdapter { 
     * Returns the binder interface to the service.

     * @hide

     */

    @UnsupportedAppUsage

    public INfcAdapter getService() {

        isEnabled();  // NOP call to recover sService if it is stale

        return sService;
@@ -676,6 +682,7 @@ public final class NfcAdapter { 
     * NFC service dead - attempt best effort recovery

     * @hide

     */

    @UnsupportedAppUsage

    public void attemptDeadServiceRecovery(Exception e) {

        Log.e(TAG, "NFC service dead - attempting to recover", e);

        INfcAdapter service = getServiceInterface();
@@ -746,6 +753,7 @@ public final class NfcAdapter { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public int getAdapterState() {

        try {

            return sService.getState();
@@ -1227,6 +1235,7 @@ public final class NfcAdapter { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void setNdefPushMessageCallback(CreateNdefMessageCallback callback, Activity activity,

            int flags) {

        if (activity == null) {
@@ -1862,6 +1871,7 @@ public final class NfcAdapter { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public INfcAdapterExtras getNfcAdapterExtrasInterface() {

        if (mContext == null) {

            throw new UnsupportedOperationException("You need a context on NfcAdapter to use the "