Merge "Add @UnsupportedAppUsage annotations" (d9381f5e) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −35

Original line number	Diff line number	Diff line
		@@ -2017,11 +2017,6 @@ Landroid/R$styleable;->Window:[I
		Landroid/R$styleable;->Window_windowBackground:I
		Landroid/R$styleable;->Window_windowFrame:I
		Landroid/security/Credentials;->convertToPem([Ljava/security/cert/Certificate;)[B
		Landroid/security/Credentials;->getInstance()Landroid/security/Credentials;
		Landroid/security/Credentials;->install(Landroid/content/Context;Ljava/lang/String;[B)V
		Landroid/security/Credentials;->install(Landroid/content/Context;Ljava/security/KeyPair;)V
		Landroid/security/Credentials;->unlock(Landroid/content/Context;)V
		Landroid/security/GateKeeper;->getSecureUserId()J
		Landroid/security/IKeyChainService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/security/IKeyChainService;
		Landroid/security/IKeyChainService;->requestPrivateKey(Ljava/lang/String;)Ljava/lang/String;
		Landroid/security/IKeystoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/security/IKeystoreService;
		@@ -2040,36 +2035,6 @@ Landroid/security/IKeystoreService;->reset()I
		Landroid/security/IKeystoreService;->sign(Ljava/lang/String;[B)[B
		Landroid/security/IKeystoreService;->ungrant(Ljava/lang/String;I)I
		Landroid/security/IKeystoreService;->verify(Ljava/lang/String;[B[B)I
		Landroid/security/keymaster/ExportResult;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/security/keymaster/KeyCharacteristics;-><init>()V
		Landroid/security/keymaster/KeyCharacteristics;->readFromParcel(Landroid/os/Parcel;)V
		Landroid/security/keymaster/KeymasterArguments;-><init>()V
		Landroid/security/keymaster/KeymasterArguments;->addEnum(II)V
		Landroid/security/keymaster/KeymasterArguments;->addUnsignedInt(IJ)V
		Landroid/security/keymaster/KeymasterArguments;->addUnsignedLong(ILjava/math/BigInteger;)V
		Landroid/security/keymaster/KeymasterArguments;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/security/keymaster/KeymasterArguments;->readFromParcel(Landroid/os/Parcel;)V
		Landroid/security/keymaster/KeymasterBlob;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/security/keymaster/OperationResult;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/security/KeyStore$State;->LOCKED:Landroid/security/KeyStore$State;
		Landroid/security/KeyStore$State;->UNLOCKED:Landroid/security/KeyStore$State;
		Landroid/security/keystore/AndroidKeyStoreProvider;->getKeyStoreOperationHandle(Ljava/lang/Object;)J
		Landroid/security/keystore/KeyGenParameterSpec;->getUid()I
		Landroid/security/keystore/KeyGenParameterSpec;->isUniqueIdIncluded()Z
		Landroid/security/KeyStore;->delete(Ljava/lang/String;)Z
		Landroid/security/KeyStore;->get(Ljava/lang/String;)[B
		Landroid/security/KeyStore;->getApplicationContext()Landroid/content/Context;
		Landroid/security/KeyStore;->getInstance()Landroid/security/KeyStore;
		Landroid/security/KeyStore;->getKeyStoreException(I)Landroid/security/KeyStoreException;
		Landroid/security/KeyStore;->isEmpty()Z
		Landroid/security/KeyStore;->NO_ERROR:I
		Landroid/security/KeyStore;->reset()Z
		Landroid/security/KeyStore;->state()Landroid/security/KeyStore$State;
		Landroid/security/KeyStore;->state(I)Landroid/security/KeyStore$State;
		Landroid/security/KeyStore;->unlock(Ljava/lang/String;)Z
		Landroid/security/KeystoreArguments;-><init>([[B)V
		Landroid/security/KeystoreArguments;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/security/net/config/RootTrustManager;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
		Landroid/service/carrier/ICarrierMessagingCallback$Stub;-><init>()V
		Landroid/service/carrier/ICarrierMessagingService;->filterSms(Landroid/service/carrier/MessagePdu;Ljava/lang/String;IILandroid/service/carrier/ICarrierMessagingCallback;)V
		Landroid/service/dreams/IDreamManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/dreams/IDreamManager;

core/java/android/security/KeystoreArguments.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.security;

		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -27,6 +28,7 @@ import android.os.Parcelable;
		public class KeystoreArguments implements Parcelable {
		public byte[][] args;

		@UnsupportedAppUsage
		public static final Parcelable.Creator<KeystoreArguments> CREATOR = new
		Parcelable.Creator<KeystoreArguments>() {
		public KeystoreArguments createFromParcel(Parcel in) {
		@@ -41,6 +43,7 @@ public class KeystoreArguments implements Parcelable {
		args = null;
		}

		@UnsupportedAppUsage
		public KeystoreArguments(byte[][] args) {
		this.args = args;
		}

core/java/android/security/keymaster/ExportResult.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.security.keymaster;

		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -27,6 +28,7 @@ public class ExportResult implements Parcelable {
		public final int resultCode;
		public final byte[] exportData;

		@UnsupportedAppUsage
		public static final Parcelable.Creator<ExportResult> CREATOR = new
		Parcelable.Creator<ExportResult>() {
		public ExportResult createFromParcel(Parcel in) {

core/java/android/security/keymaster/KeyCharacteristics.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.security.keymaster;

		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -44,6 +45,7 @@ public class KeyCharacteristics implements Parcelable {
		}
		};

		@UnsupportedAppUsage
		public KeyCharacteristics() {}

		protected KeyCharacteristics(Parcel in) {
		@@ -61,6 +63,7 @@ public class KeyCharacteristics implements Parcelable {
		hwEnforced.writeToParcel(out, flags);
		}

		@UnsupportedAppUsage
		public void readFromParcel(Parcel in) {
		swEnforced = KeymasterArguments.CREATOR.createFromParcel(in);
		hwEnforced = KeymasterArguments.CREATOR.createFromParcel(in);

core/java/android/security/keymaster/KeymasterArguments.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.security.keymaster;

		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -40,6 +41,7 @@ public class KeymasterArguments implements Parcelable {

		private List<KeymasterArgument> mArguments;

		@UnsupportedAppUsage
		public static final Parcelable.Creator<KeymasterArguments> CREATOR = new
		Parcelable.Creator<KeymasterArguments>() {
		@Override
		@@ -53,6 +55,7 @@ public class KeymasterArguments implements Parcelable {
		}
		};

		@UnsupportedAppUsage
		public KeymasterArguments() {
		mArguments = new ArrayList<KeymasterArgument>();
		}
		@@ -66,6 +69,7 @@ public class KeymasterArguments implements Parcelable {
		*
		* @throws IllegalArgumentException if {@code tag} is not an enum tag.
		*/
		@UnsupportedAppUsage
		public void addEnum(int tag, int value) {
		int tagType = KeymasterDefs.getTagType(tag);
		if ((tagType != KeymasterDefs.KM_ENUM) && (tagType != KeymasterDefs.KM_ENUM_REP)) {
		@@ -137,6 +141,7 @@ public class KeymasterArguments implements Parcelable {
		* @throws IllegalArgumentException if {@code tag} is not an unsigned 32-bit int tag or if
		* {@code value} is outside of the permitted range [0; 2^32).
		*/
		@UnsupportedAppUsage
		public void addUnsignedInt(int tag, long value) {
		int tagType = KeymasterDefs.getTagType(tag);
		if ((tagType != KeymasterDefs.KM_UINT) && (tagType != KeymasterDefs.KM_UINT_REP)) {
		@@ -173,6 +178,7 @@ public class KeymasterArguments implements Parcelable {
		* @throws IllegalArgumentException if {@code tag} is not an unsigned 64-bit long tag or if
		* {@code value} is outside of the permitted range [0; 2^64).
		*/
		@UnsupportedAppUsage
		public void addUnsignedLong(int tag, BigInteger value) {
		int tagType = KeymasterDefs.getTagType(tag);
		if ((tagType != KeymasterDefs.KM_ULONG) && (tagType != KeymasterDefs.KM_ULONG_REP)) {
		@@ -358,6 +364,7 @@ public class KeymasterArguments implements Parcelable {
		out.writeTypedList(mArguments);
		}

		@UnsupportedAppUsage
		public void readFromParcel(Parcel in) {
		in.readTypedList(mArguments, KeymasterArgument.CREATOR);
		}