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

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

Update Trusted Credentials screen in settings 

Trusted credentials for both the primary user and its managed profiles are shown
on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling
of certificates) remain available.

Bug: 16029580

Change-Id: Ia92ae02d8c572bf4a3be172f6c255726cefc0fa1
parent 1cc41c93

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