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

Commit f8d72cc1 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban
Browse files

Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" 

This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
parent f75aadc0

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

0 → 100644
+32 −0
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];

                }

    };

}

keystore/java/android/security/IKeyChainService.aidl

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package android.security;



import android.content.pm.ParceledListSlice;



/**

 * Caller is required to ensure that {@link KeyStore#unlock

 * KeyStore.unlock} was successful.
@@ -32,6 +34,11 @@ 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);

keystore/java/android/security/KeyChain.java

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

    }



    private static X509Certificate toCertificate(byte[] bytes) {

    /** @hide */

    public static X509Certificate toCertificate(byte[] bytes) {

        if (bytes == null) {

            throw new IllegalArgumentException("bytes == null");

        }

wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java

+1 −28
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 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;
@@ -296,34 +297,6 @@ 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;