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

Commit 8eb4ba49 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4701683 from 7b7e87ee to pi-release 

Change-Id: I8eb9d412604336195a8cfa15cf62e8d753f75618
parents f770fc39 7b7e87ee

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -23165,6 +23165,7 @@ package android.media { 
    field public static final int AACObjectMain = 1; // 0x1

    field public static final int AACObjectSSR = 3; // 0x3

    field public static final int AACObjectScalable = 6; // 0x6

    field public static final int AACObjectXHE = 42; // 0x2a

    field public static final int AVCLevel1 = 1; // 0x1

    field public static final int AVCLevel11 = 4; // 0x4

    field public static final int AVCLevel12 = 8; // 0x8
@@ -27259,6 +27260,7 @@ package android.net { 
    method public int describeContents();

    method public boolean hasCapability(int);

    method public boolean hasTransport(int);

    method public boolean hasUnwantedCapability(int);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;

  }
@@ -38752,7 +38754,7 @@ package android.security.keystore { 
    ctor public UserNotAuthenticatedException(java.lang.String, java.lang.Throwable);

  }













  public class UserPresenceUnavailableException extends java.security.InvalidAlgorithmParameterException {













  public class UserPresenceUnavailableException extends java.security.InvalidKeyException {















    ctor public UserPresenceUnavailableException();















    ctor public UserPresenceUnavailableException(java.lang.String);















    ctor public UserPresenceUnavailableException(java.lang.String, java.lang.Throwable);










@@ -50538,7 +50540,7 @@ package android.view.textclassifier {













    method public static android.view.textclassifier.TextClassifier.EntityConfig createWithHints(java.util.Collection<java.lang.String>);















    method public int describeContents();















    method public java.util.Collection<java.lang.String> getHints();













    method public java.util.List<java.lang.String> resolveEntityListModifications(java.util.Collection<java.lang.String>);













    method public java.util.Collection<java.lang.String> resolveEntityListModifications(java.util.Collection<java.lang.String>);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextClassifier.EntityConfig> CREATOR;















  }

























api/system-current.txt



+0
−13




























Original line number
Diff line number
Diff line








@@ -4353,7 +4353,6 @@ package android.security.keystore.recovery {













    method public byte[] getServerParams();















    method public int getSnapshotVersion();















    method public java.security.cert.CertPath getTrustedHardwareCertPath();













    method public deprecated byte[] getTrustedHardwarePublicKey();















    method public java.util.List<android.security.keystore.recovery.WrappedApplicationKey> getWrappedApplicationKeys();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyChainSnapshot> CREATOR;









@@ -4378,25 +4377,18 @@ package android.security.keystore.recovery {





























  public class RecoveryController {















    method public android.security.keystore.recovery.RecoverySession createRecoverySession();













    method public byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;















    method public java.security.Key generateKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public java.util.List<java.lang.String> getAliases() throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);















    method public java.security.Key getKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, java.security.UnrecoverableKeyException;















    method public android.security.keystore.recovery.KeyChainSnapshot getKeyChainSnapshot() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public int getRecoveryStatus(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public java.util.Map<java.lang.String, java.security.cert.X509Certificate> getRootCertificates();















    method public java.security.Key importKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void initRecoveryService(java.lang.String, byte[], byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void removeKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setRecoverySecretTypes(int[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;















    method public void setRecoveryStatus(java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setServerParams(byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;















    method public void setSnapshotCreatedPendingIntent(android.app.PendingIntent) throws android.security.keystore.recovery.InternalRecoveryServiceException;









@@ -4408,9 +4400,6 @@ package android.security.keystore.recovery {













  public class RecoverySession implements java.lang.AutoCloseable {















    method public void close();















    method public java.util.Map<java.lang.String, java.security.Key> recoverKeyChainSnapshot(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















    method public byte[] start(java.lang.String, java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;















  }

























@@ -4420,7 +4409,6 @@ package android.security.keystore.recovery {





























  public final class WrappedApplicationKey implements android.os.Parcelable {















    method public int describeContents();













    method public deprecated byte[] getAccount();















    method public java.lang.String getAlias();















    method public byte[] getEncryptedKeyMaterial();















    method public void writeToParcel(android.os.Parcel, int);









@@ -4430,7 +4418,6 @@ package android.security.keystore.recovery {













  public static class WrappedApplicationKey.Builder {















    ctor public WrappedApplicationKey.Builder();















    method public android.security.keystore.recovery.WrappedApplicationKey build();













    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);















    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setAlias(java.lang.String);















    method public android.security.keystore.recovery.WrappedApplicationKey.Builder setEncryptedKeyMaterial(byte[]);















  }

































api/system-removed.txt



+31
−0




























Original line number
Diff line number
Diff line








@@ -91,6 +91,37 @@ package android.os {





























}





























package android.security.keystore.recovery {



























  public final class KeyChainSnapshot implements android.os.Parcelable {













    method public deprecated byte[] getTrustedHardwarePublicKey();













  }



























  public class RecoveryController {













    method public deprecated java.security.Key generateKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;













    method public deprecated java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;













  }



























  public class RecoverySession implements java.lang.AutoCloseable {













    method public deprecated java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;













    method public deprecated byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













    method public deprecated byte[] start(java.security.cert.CertPath, byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;













  }



























  public final class WrappedApplicationKey implements android.os.Parcelable {













    method public deprecated byte[] getAccount();













  }



























  public static class WrappedApplicationKey.Builder {













    method public deprecated android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);













  }



























}





























package android.service.notification {































  public abstract class NotificationListenerService extends android.app.Service {

































cmds/statsd/Android.mk



+2
−1




























Original line number
Diff line number
Diff line








@@ -209,7 +209,8 @@ LOCAL_SRC_FILES := \













    tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp \















    tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp \















    tests/e2e/Anomaly_count_e2e_test.cpp \













    tests/e2e/Anomaly_duration_sum_e2e_test.cpp













    tests/e2e/Anomaly_duration_sum_e2e_test.cpp \













    tests/e2e/ConfigTtl_e2e_test.cpp































LOCAL_STATIC_LIBRARIES := \















    $(statsd_common_static_libraries) \

































cmds/statsd/benchmark/metric_util.cpp



+1
−1




























Original line number
Diff line number
Diff line








@@ -366,7 +366,7 @@ sp<StatsLogProcessor> CreateStatsLogProcessor(const long timeBaseSec, const Stat













    sp<AlarmMonitor> periodicAlarmMonitor;















    sp<StatsLogProcessor> processor = new StatsLogProcessor(















        uidMap, anomalyAlarmMonitor, periodicAlarmMonitor, timeBaseSec, [](const ConfigKey&){});













    processor->OnConfigUpdated(0, key, config);













    processor->OnConfigUpdated(timeBaseSec * NS_PER_SEC, key, config);















    return processor;















}