Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev

Browse Source 
* commit '084a11612dd1b1958f4421315e3929657723f7c9':
  Revert "Update Trusted Credentials screen in settings"
This commit is contained in:
Zoltan Szatmary-Ban
2014-08-07 13:53:10 +00:00
committed by Android Git Automerger
parent bdbd4a55ef 2fe77f5393
commit 5576e855bf
4 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/com/android/internal/util/ParcelableString.java
View File

@@ -1,32 +0,0 @@
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];
}
};
}

7
keystore/java/android/security/IKeyChainService.aidl
View File

@@ -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.
@@ -37,11 +35,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);

3
keystore/java/android/security/KeyChain.java
View File

@@ -468,8 +468,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");
}

29
wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java
View File

@@ -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;
@@ -352,6 +351,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;