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

Commit 6d4f195f authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge changes from topics 'handle-storage-update', 'action-storage-changed' 

* changes:
  Update trusted certificates when the trust store is changed
  Deprecate ACTION_STORAGE_CHANGED
parents 86fd31bd c72875b0

api/current.txt

+6 −1
Original line number Diff line number Diff line
@@ -34272,8 +34272,13 @@ package android.security { 
    method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;

    method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);

    method public static boolean isKeyAlgorithmSupported(java.lang.String);

    field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";

    field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";

    field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";

    field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";

    field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";

    field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";

    field public static final java.lang.String EXTRA_NAME = "name";

    field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";

  }

api/system-current.txt

+6 −1
Original line number Diff line number Diff line
@@ -37020,8 +37020,13 @@ package android.security { 
    method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;

    method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);

    method public static boolean isKeyAlgorithmSupported(java.lang.String);

    field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";

    field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";

    field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";

    field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";

    field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";

    field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";

    field public static final java.lang.String EXTRA_NAME = "name";

    field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";

  }

api/test-current.txt

+6 −2
Original line number Diff line number Diff line
@@ -34349,8 +34349,13 @@ package android.security { 
    method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;

    method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);

    method public static boolean isKeyAlgorithmSupported(java.lang.String);

    field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";

    field public static final java.lang.String ACTION_KEY_ACCESS_CHANGED = "android.security.action.KEY_ACCESS_CHANGED";

    field public static final deprecated java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";

    field public static final java.lang.String ACTION_TRUST_STORE_CHANGED = "android.security.action.TRUST_STORE_CHANGED";

    field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";

    field public static final java.lang.String EXTRA_KEY_ACCESSIBLE = "android.security.extra.KEY_ACCESSIBLE";

    field public static final java.lang.String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS";

    field public static final java.lang.String EXTRA_NAME = "name";

    field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";

  }
@@ -34405,7 +34410,6 @@ package android.security { 














  public class NetworkSecurityPolicy {















    method public static android.security.NetworkSecurityPolicy getInstance();













    method public void handleTrustStorageUpdate();















    method public boolean isCleartextTrafficPermitted();















    method public boolean isCleartextTrafficPermitted(java.lang.String);















  }

























core/java/android/app/ActivityThread.java



+6
−0






























Original line number
Diff line number
Diff line








@@ -81,6 +81,7 @@ import android.os.Trace;













import android.os.TransactionTooLargeException;















import android.os.UserHandle;















import android.provider.Settings;













import android.security.NetworkSecurityPolicy;















import android.security.net.config.NetworkSecurityConfigProvider;















import android.util.AndroidRuntimeException;















import android.util.ArrayMap;










@@ -1324,6 +1325,11 @@ public final class ActivityThread {













            args.arg2 = voiceInteractor;















            sendMessage(H.LOCAL_VOICE_INTERACTION_STARTED, args);















        }



























        @Override













        public void handleTrustStorageUpdate() {













            NetworkSecurityPolicy.getInstance().handleTrustStorageUpdate();













        }















    }































    private int getLifecycleSeq() {

































core/java/android/app/ApplicationThreadNative.java



+14
−0






























Original line number
Diff line number
Diff line








@@ -749,6 +749,12 @@ public abstract class ApplicationThreadNative extends Binder













            schedulePictureInPictureModeChanged(b, inPip);















            return true;















        }













        case HANDLE_TRUST_STORAGE_UPDATE_TRANSACTION:













        {













            data.enforceInterface(IApplicationThread.descriptor);













            handleTrustStorageUpdate();













            return true;













        }































        }


























@@ -1522,4 +1528,12 @@ class ApplicationThreadProxy implements IApplicationThread {













                IBinder.FLAG_ONEWAY);















        data.recycle();















    }



























    @Override













    public void handleTrustStorageUpdate() throws RemoteException {













        Parcel data = Parcel.obtain();













        data.writeInterfaceToken(IApplicationThread.descriptor);













        mRemote.transact(HANDLE_TRUST_STORAGE_UPDATE_TRANSACTION, data, null, IBinder.FLAG_ONEWAY);













        data.recycle();













    }















}