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

Commit 6ccab096 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: 89ac9501 am: b2b30951 

Change-Id: Ia3b772ad3ae7c26d92f3367a3689579cd00860ab
parents e0213692 b2b30951

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -917,6 +917,7 @@ java_library { 
        "core/java/android/os/RemoteException.java",

        "core/java/android/util/AndroidException.java",

    ],

    libs: [ "unsupportedappusage" ],



    dxflags: ["--core-library"],

    installable: false,

core/java/android/net/nsd/NsdServiceInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
package android.net.nsd;



import android.annotation.NonNull;

import android.annotation.UnsupportedAppUsage;

import android.os.Parcelable;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Base64;

import android.util.Log;

import android.util.ArrayMap;



import java.io.UnsupportedEncodingException;

import java.net.InetAddress;

core/java/android/nfc/ErrorCodes.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



/**

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

core/java/android/nfc/NdefRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Intent;

import android.net.Uri;

import android.os.Parcel;

core/java/android/nfc/NfcActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.nfc;



import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.Application;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentProvider;

import android.content.Intent;

import android.net.Uri;
@@ -26,7 +26,6 @@ import android.nfc.NfcAdapter.ReaderCallback; 
import android.os.Binder;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.Log;



import java.util.ArrayList;