Merge "Multi-threaded keystore" (9f248989) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+11 −12

Original line number	Diff line number	Diff line
		@@ -1392,18 +1392,6 @@ Landroid/R$styleable;->Window_windowFrame:I
		Landroid/security/Credentials;->convertToPem([Ljava/security/cert/Certificate;)[B
		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;
		Landroid/security/IKeystoreService;->clear_uid(J)I
		Landroid/security/IKeystoreService;->del(Ljava/lang/String;I)I
		Landroid/security/IKeystoreService;->exist(Ljava/lang/String;I)I
		Landroid/security/IKeystoreService;->generateKey(Ljava/lang/String;Landroid/security/keymaster/KeymasterArguments;[BIILandroid/security/keymaster/KeyCharacteristics;)I
		Landroid/security/IKeystoreService;->get(Ljava/lang/String;I)[B
		Landroid/security/IKeystoreService;->getState(I)I
		Landroid/security/IKeystoreService;->insert(Ljava/lang/String;[BII)I
		Landroid/security/IKeystoreService;->is_hardware_backed(Ljava/lang/String;)I
		Landroid/security/IKeystoreService;->list(Ljava/lang/String;I)[Ljava/lang/String;
		Landroid/security/IKeystoreService;->reset()I
		Landroid/security/IKeystoreService;->ungrant(Ljava/lang/String;I)I
		Landroid/security/keymaster/KeymasterBlobArgument;-><init>(ILandroid/os/Parcel;)V
		Landroid/security/keymaster/KeymasterBlobArgument;-><init>(I[B)V
		Landroid/security/keymaster/KeymasterBlobArgument;->blob:[B
		@@ -1415,6 +1403,17 @@ Landroid/security/keymaster/KeymasterIntArgument;->value:I
		Landroid/security/keymaster/KeymasterLongArgument;-><init>(IJ)V
		Landroid/security/keymaster/KeymasterLongArgument;-><init>(ILandroid/os/Parcel;)V
		Landroid/security/keymaster/KeymasterLongArgument;->value:J
		Landroid/security/keystore/IKeystoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/security/keystore/IKeystoreService;
		Landroid/security/keystore/IKeystoreService;->clear_uid(J)I
		Landroid/security/keystore/IKeystoreService;->del(Ljava/lang/String;I)I
		Landroid/security/keystore/IKeystoreService;->exist(Ljava/lang/String;I)I
		Landroid/security/keystore/IKeystoreService;->get(Ljava/lang/String;I)[B
		Landroid/security/keystore/IKeystoreService;->getState(I)I
		Landroid/security/keystore/IKeystoreService;->insert(Ljava/lang/String;[BII)I
		Landroid/security/keystore/IKeystoreService;->is_hardware_backed(Ljava/lang/String;)I
		Landroid/security/keystore/IKeystoreService;->list(Ljava/lang/String;I)[Ljava/lang/String;
		Landroid/security/keystore/IKeystoreService;->reset()I
		Landroid/security/keystore/IKeystoreService;->ungrant(Ljava/lang/String;I)I
		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/keymaster/ExportResult.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@ public class ExportResult implements Parcelable {
		public final int resultCode;
		public final byte[] exportData;

		public ExportResult(int resultCode) {
		this.resultCode = resultCode;
		this.exportData = new byte[0];
		}

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

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,14 @@ public class KeyCharacteristics implements Parcelable {
		readFromParcel(in);
		}

		/**
		* Makes a shallow copy of other by copying the other's references to the KeymasterArguments
		*/
		public void shallowCopyFrom(KeyCharacteristics other) {
		this.swEnforced = other.swEnforced;
		this.hwEnforced = other.hwEnforced;
		}

		@Override
		public int describeContents() {
		return 0;

core/java/android/security/keymaster/KeymasterCertificateChain.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,14 @@ public class KeymasterCertificateChain implements Parcelable {
		readFromParcel(in);
		}

		/**
		* Makes a shallow copy of other by copying the reference to the certificate chain list.
		* @param other
		*/
		public void shallowCopyFrom(KeymasterCertificateChain other) {
		this.mCertificates = other.mCertificates;
		}

		public List<byte[]> getCertificates() {
		return mCertificates;
		}

core/java/android/security/keymaster/OperationResult.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,10 @@ public class OperationResult implements Parcelable {
		this.outParams = outParams;
		}

		public OperationResult(int resultCode) {
		this(resultCode, null, 0, 0, null, null);
		}

		protected OperationResult(Parcel in) {
		resultCode = in.readInt();
		token = in.readStrongBinder();