Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials... (9c7ed91d) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/ParcelableString.java

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		package com.android.internal.util;

		import android.os.Parcel;
		import android.os.Parcelable;

		public class ParcelableString implements Parcelable {
		public String string;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeString(string);
		}

		public static final Parcelable.Creator<ParcelableString> CREATOR =
		new Parcelable.Creator<ParcelableString>() {
		@Override
		public ParcelableString createFromParcel(Parcel in) {
		ParcelableString ret = new ParcelableString();
		ret.string = in.readString();
		return ret;
		}
		@Override
		public ParcelableString[] newArray(int size) {
		return new ParcelableString[size];
		}
		};
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		*/
		package android.security;

		import android.content.pm.ParceledListSlice;

		/**
		* Caller is required to ensure that {@link KeyStore#unlock
		* KeyStore.unlock} was successful.
		@@ -34,11 +32,6 @@ interface IKeyChainService {
		// APIs used by Settings
		boolean deleteCaCertificate(String alias);
		boolean reset();
		ParceledListSlice getUserCaAliases();
		ParceledListSlice getSystemCaAliases();
		boolean containsCaAlias(String alias);
		byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem);
		List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem);

		// APIs used by KeyChainActivity
		void setGrant(int uid, String alias, boolean value);

+1 −2

Original line number	Diff line number	Diff line
		@@ -397,8 +397,7 @@ public final class KeyChain {
		return KeyStore.getInstance().isHardwareBacked(algorithm);
		}

		/** @hide */
		public static X509Certificate toCertificate(byte[] bytes) {
		private static X509Certificate toCertificate(byte[] bytes) {
		if (bytes == null) {
		throw new IllegalArgumentException("bytes == null");
		}

+28 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.os.RemoteException;
		import android.util.Log;

		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.ParcelableString;
		import com.android.internal.util.Protocol;

		import java.util.ArrayList;
		@@ -297,6 +296,34 @@ public class WifiPasspointManager {

		}

		public static class ParcelableString implements Parcelable {
		public String string;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeString(string);
		}

		public static final Parcelable.Creator<ParcelableString> CREATOR =
		new Parcelable.Creator<ParcelableString>() {
		@Override
		public ParcelableString createFromParcel(Parcel in) {
		ParcelableString ret = new ParcelableString();
		ret.string = in.readString();
		return ret;
		}
		@Override
		public ParcelableString[] newArray(int size) {
		return new ParcelableString[size];
		}
		};
		}

		private static final int BASE = Protocol.BASE_WIFI_PASSPOINT_MANAGER;

		public static final int REQUEST_ANQP_INFO = BASE + 1;