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

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

Snap for 4696032 from 18603cdf to pi-release 

Change-Id: Id05697471eceef29b384c2f37ce71ccc60dfc681
parents 9e8a596e 18603cdf

api/current.txt

+74 −44
Original line number Diff line number Diff line
@@ -7360,8 +7360,8 @@ package android.app.usage { 
    method public int getCount();

    method public int getEventType();

    method public long getFirstTimeStamp();

    method public long getLastEventTime();

    method public long getLastTimeStamp();

    method public long getLastTimeUsed();

    method public long getTotalTime();

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

    field public static final android.os.Parcelable.Creator<android.app.usage.EventStats> CREATOR;
@@ -7418,8 +7418,9 @@ package android.app.usage { 














  public class NetworkStatsManager {















    method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;













    method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;













    method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws java.lang.SecurityException;















    method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int) throws java.lang.SecurityException;













    method public android.app.usage.NetworkStats queryDetailsForUidTagState(int, java.lang.String, long, long, int, int, int) throws java.lang.SecurityException;















    method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;















    method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;















    method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;










@@ -7469,6 +7470,8 @@ package android.app.usage {













    method public int getStandbyBucket();















    method public long getTimeStamp();















    field public static final int CONFIGURATION_CHANGE = 5; // 0x5













    field public static final int KEYGUARD_HIDDEN = 18; // 0x12













    field public static final int KEYGUARD_SHOWN = 17; // 0x11















    field public static final int MOVE_TO_BACKGROUND = 2; // 0x2















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















    field public static final int NONE = 0; // 0x0










@@ -13349,9 +13352,13 @@ package android.graphics {













    method public void rotate(float);















    method public final void rotate(float, float, float);















    method public int save();













    method public deprecated int saveLayer(android.graphics.RectF, android.graphics.Paint, int);















    method public int saveLayer(android.graphics.RectF, android.graphics.Paint);













    method public deprecated int saveLayer(float, float, float, float, android.graphics.Paint, int);















    method public int saveLayer(float, float, float, float, android.graphics.Paint);













    method public deprecated int saveLayerAlpha(android.graphics.RectF, int, int);















    method public int saveLayerAlpha(android.graphics.RectF, int);













    method public deprecated int saveLayerAlpha(float, float, float, float, int, int);















    method public int saveLayerAlpha(float, float, float, float, int);















    method public void scale(float, float);















    method public final void scale(float, float, float, float);









@@ -13361,6 +13368,7 @@ package android.graphics {













    method public void setMatrix(android.graphics.Matrix);















    method public void skew(float, float);















    method public void translate(float, float);













    field public static final int ALL_SAVE_FLAG = 31; // 0x1f















  }





























  public static final class Canvas.EdgeType extends java.lang.Enum {










@@ -27259,6 +27267,7 @@ package android.net {













    ctor public NetworkRequest.Builder();















    method public android.net.NetworkRequest.Builder addCapability(int);















    method public android.net.NetworkRequest.Builder addTransportType(int);













    method public android.net.NetworkRequest.Builder addUnwantedCapability(int);















    method public android.net.NetworkRequest build();















    method public android.net.NetworkRequest.Builder removeCapability(int);















    method public android.net.NetworkRequest.Builder removeTransportType(int);










@@ -38572,11 +38581,11 @@ package android.security.keystore {













    method public boolean isInvalidatedByBiometricEnrollment();















    method public boolean isRandomizedEncryptionRequired();















    method public boolean isStrongBoxBacked();













    method public boolean isTrustedUserPresenceRequired();















    method public boolean isUnlockedDeviceRequired();















    method public boolean isUserAuthenticationRequired();















    method public boolean isUserAuthenticationValidWhileOnBody();















    method public boolean isUserConfirmationRequired();













    method public boolean isUserPresenceRequired();















  }





























  public static final class KeyGenParameterSpec.Builder {









@@ -38600,12 +38609,12 @@ package android.security.keystore {













    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);















    method public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean);















    method public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...);













    method public android.security.keystore.KeyGenParameterSpec.Builder setTrustedUserPresenceRequired(boolean);















    method public android.security.keystore.KeyGenParameterSpec.Builder setUnlockedDeviceRequired(boolean);















    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(boolean);















    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidWhileOnBody(boolean);















    method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidityDurationSeconds(int);















    method public android.security.keystore.KeyGenParameterSpec.Builder setUserConfirmationRequired(boolean);













    method public android.security.keystore.KeyGenParameterSpec.Builder setUserPresenceRequired(boolean);















  }





























  public class KeyInfo implements java.security.spec.KeySpec {










@@ -38693,11 +38702,11 @@ package android.security.keystore {













    method public boolean isDigestsSpecified();















    method public boolean isInvalidatedByBiometricEnrollment();















    method public boolean isRandomizedEncryptionRequired();













    method public boolean isTrustedUserPresenceRequired();















    method public boolean isUnlockedDeviceRequired();















    method public boolean isUserAuthenticationRequired();















    method public boolean isUserAuthenticationValidWhileOnBody();















    method public boolean isUserConfirmationRequired();













    method public boolean isUserPresenceRequired();















  }





























  public static final class KeyProtection.Builder {









@@ -38713,15 +38722,26 @@ package android.security.keystore {













    method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);















    method public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean);















    method public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...);













    method public android.security.keystore.KeyProtection.Builder setTrustedUserPresenceRequired(boolean);















    method public android.security.keystore.KeyProtection.Builder setUnlockedDeviceRequired(boolean);















    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(boolean);















    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidWhileOnBody(boolean);















    method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int);















    method public android.security.keystore.KeyProtection.Builder setUserConfirmationRequired(boolean);













    method public android.security.keystore.KeyProtection.Builder setUserPresenceRequired(boolean);













  }

























  public class SecureKeyImportUnavailableException extends java.security.ProviderException {













    ctor public SecureKeyImportUnavailableException();













    ctor public SecureKeyImportUnavailableException(java.lang.String);













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













    ctor public SecureKeyImportUnavailableException(java.lang.Throwable);















  }





























  public class StrongBoxUnavailableException extends java.security.ProviderException {













    ctor public StrongBoxUnavailableException();













    ctor public StrongBoxUnavailableException(java.lang.String);













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













    ctor public StrongBoxUnavailableException(java.lang.Throwable);















  }





























  public class UserNotAuthenticatedException extends java.security.InvalidKeyException {










@@ -44654,11 +44674,6 @@ package android.text.util {













    method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String);















    method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter);















    method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter);













    method public static java.util.concurrent.Future<java.lang.Void> addLinksAsync(android.widget.TextView, android.view.textclassifier.TextLinks.Options);













    method public static java.util.concurrent.Future<java.lang.Void> addLinksAsync(android.widget.TextView, android.view.textclassifier.TextLinks.Options, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>);













    method public static java.util.concurrent.Future<java.lang.Void> addLinksAsync(android.text.Spannable, android.view.textclassifier.TextClassifier, android.view.textclassifier.TextLinks.Options);













    method public static java.util.concurrent.Future<java.lang.Void> addLinksAsync(android.text.Spannable, android.view.textclassifier.TextClassifier, int);













    method public static java.util.concurrent.Future<java.lang.Void> addLinksAsync(android.text.Spannable, android.view.textclassifier.TextClassifier, android.view.textclassifier.TextLinks.Options, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>);















    field public static final int ALL = 15; // 0xf















    field public static final int EMAIL_ADDRESSES = 2; // 0x2















    field public static final int MAP_ADDRESSES = 8; // 0x8










@@ -50371,8 +50386,8 @@ package android.view.textclassifier {













    method public int getEventType();















    method public int getInvocationMethod();















    method public java.lang.String getPackageName();













    method public java.lang.String getResultId();















    method public android.view.textclassifier.TextClassificationSessionId getSessionId();













    method public java.lang.String getSignature();















    method public int getSmartEnd();















    method public int getSmartStart();















    method public int getStart();










@@ -50409,10 +50424,10 @@ package android.view.textclassifier {













    method public java.lang.String getEntity(int);















    method public int getEntityCount();















    method public deprecated android.graphics.drawable.Drawable getIcon();













    method public java.lang.String getId();















    method public deprecated android.content.Intent getIntent();















    method public deprecated java.lang.CharSequence getLabel();















    method public deprecated android.view.View.OnClickListener getOnClickListener();













    method public java.lang.String getSignature();















    method public java.lang.String getText();















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















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









@@ -50424,28 +50439,38 @@ package android.view.textclassifier {













    method public android.view.textclassifier.TextClassification build();















    method public android.view.textclassifier.TextClassification.Builder setEntityType(java.lang.String, float);















    method public deprecated android.view.textclassifier.TextClassification.Builder setIcon(android.graphics.drawable.Drawable);













    method public android.view.textclassifier.TextClassification.Builder setId(java.lang.String);















    method public deprecated android.view.textclassifier.TextClassification.Builder setIntent(android.content.Intent);















    method public deprecated android.view.textclassifier.TextClassification.Builder setLabel(java.lang.String);















    method public deprecated android.view.textclassifier.TextClassification.Builder setOnClickListener(android.view.View.OnClickListener);













    method public android.view.textclassifier.TextClassification.Builder setSignature(java.lang.String);















    method public android.view.textclassifier.TextClassification.Builder setText(java.lang.String);















  }



























  public static final class TextClassification.Options implements android.os.Parcelable {













    ctor public TextClassification.Options();













  public static final class TextClassification.Request implements android.os.Parcelable {















    method public int describeContents();















    method public android.os.LocaleList getDefaultLocales();













    method public int getEndIndex();















    method public java.time.ZonedDateTime getReferenceTime();













    method public android.view.textclassifier.TextClassification.Options setDefaultLocales(android.os.LocaleList);













    method public android.view.textclassifier.TextClassification.Options setReferenceTime(java.time.ZonedDateTime);













    method public int getStartIndex();













    method public java.lang.CharSequence getText();















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













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextClassification.Options> CREATOR;













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextClassification.Request> CREATOR;













  }

























  public static final class TextClassification.Request.Builder {













    ctor public TextClassification.Request.Builder(java.lang.CharSequence, int, int);













    method public android.view.textclassifier.TextClassification.Request build();













    method public android.view.textclassifier.TextClassification.Request.Builder setDefaultLocales(android.os.LocaleList);













    method public android.view.textclassifier.TextClassification.Request.Builder setReferenceTime(java.time.ZonedDateTime);















  }



























  public final class TextClassificationContext {













  public final class TextClassificationContext implements android.os.Parcelable {













    method public int describeContents();















    method public java.lang.String getPackageName();















    method public java.lang.String getWidgetType();















    method public java.lang.String getWidgetVersion();













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













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















  }





























  public static final class TextClassificationContext.Builder {









@@ -50472,17 +50497,14 @@ package android.view.textclassifier {













  }





























  public abstract interface TextClassifier {













    method public default android.view.textclassifier.TextClassification classifyText(java.lang.CharSequence, int, int, android.view.textclassifier.TextClassification.Options);













    method public default android.view.textclassifier.TextClassification classifyText(java.lang.CharSequence, int, int);













    method public default android.view.textclassifier.TextClassification classifyText(android.view.textclassifier.TextClassification.Request);















    method public default android.view.textclassifier.TextClassification classifyText(java.lang.CharSequence, int, int, android.os.LocaleList);















    method public default void destroy();













    method public default android.view.textclassifier.TextLinks generateLinks(java.lang.CharSequence, android.view.textclassifier.TextLinks.Options);













    method public default android.view.textclassifier.TextLinks generateLinks(java.lang.CharSequence);













    method public default android.view.textclassifier.TextLinks generateLinks(android.view.textclassifier.TextLinks.Request);















    method public default int getMaxGenerateLinksTextLength();















    method public default boolean isDestroyed();















    method public default void onSelectionEvent(android.view.textclassifier.SelectionEvent);













    method public default android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.view.textclassifier.TextSelection.Options);













    method public default android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);













    method public default android.view.textclassifier.TextSelection suggestSelection(android.view.textclassifier.TextSelection.Request);















    method public default android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int, android.os.LocaleList);















    field public static final java.lang.String HINT_TEXT_IS_EDITABLE = "android.text_is_editable";















    field public static final java.lang.String HINT_TEXT_IS_NOT_EDITABLE = "android.text_is_not_editable";









@@ -50508,9 +50530,9 @@ package android.view.textclassifier {













  }





























  public static final class TextClassifier.EntityConfig implements android.os.Parcelable {













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















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













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













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













    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>);









@@ -50519,6 +50541,7 @@ package android.view.textclassifier {













  }





























  public final class TextLinks implements android.os.Parcelable {













    method public int apply(android.text.Spannable, int, java.util.function.Function<android.view.textclassifier.TextLinks.TextLink, android.view.textclassifier.TextLinks.TextLinkSpan>);















    method public int describeContents();















    method public java.util.Collection<android.view.textclassifier.TextLinks.TextLink> getLinks();















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









@@ -50538,20 +50561,20 @@ package android.view.textclassifier {













    method public android.view.textclassifier.TextLinks.Builder clearTextLinks();















  }



























  public static final class TextLinks.Options implements android.os.Parcelable {













    ctor public TextLinks.Options();













  public static final class TextLinks.Request implements android.os.Parcelable {















    method public int describeContents();













    method public static android.view.textclassifier.TextLinks.Options fromLinkMask(int);













    method public int getApplyStrategy();















    method public android.os.LocaleList getDefaultLocales();















    method public android.view.textclassifier.TextClassifier.EntityConfig getEntityConfig();













    method public java.util.function.Function<android.view.textclassifier.TextLinks.TextLink, android.view.textclassifier.TextLinks.TextLinkSpan> getSpanFactory();













    method public android.view.textclassifier.TextLinks.Options setApplyStrategy(int);













    method public android.view.textclassifier.TextLinks.Options setDefaultLocales(android.os.LocaleList);













    method public android.view.textclassifier.TextLinks.Options setEntityConfig(android.view.textclassifier.TextClassifier.EntityConfig);













    method public android.view.textclassifier.TextLinks.Options setSpanFactory(java.util.function.Function<android.view.textclassifier.TextLinks.TextLink, android.view.textclassifier.TextLinks.TextLinkSpan>);













    method public java.lang.CharSequence getText();















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













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextLinks.Options> CREATOR;













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextLinks.Request> CREATOR;













  }

























  public static final class TextLinks.Request.Builder {













    ctor public TextLinks.Request.Builder(java.lang.CharSequence);













    method public android.view.textclassifier.TextLinks.Request build();













    method public android.view.textclassifier.TextLinks.Request.Builder setDefaultLocales(android.os.LocaleList);













    method public android.view.textclassifier.TextLinks.Request.Builder setEntityConfig(android.view.textclassifier.TextClassifier.EntityConfig);















  }





























  public static final class TextLinks.TextLink implements android.os.Parcelable {









@@ -50576,9 +50599,9 @@ package android.view.textclassifier {













    method public float getConfidenceScore(java.lang.String);















    method public java.lang.String getEntity(int);















    method public int getEntityCount();













    method public java.lang.String getId();















    method public int getSelectionEndIndex();















    method public int getSelectionStartIndex();













    method public java.lang.String getSignature();















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















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















  }









@@ -50587,16 +50610,23 @@ package android.view.textclassifier {













    ctor public TextSelection.Builder(int, int);















    method public android.view.textclassifier.TextSelection build();















    method public android.view.textclassifier.TextSelection.Builder setEntityType(java.lang.String, float);













    method public android.view.textclassifier.TextSelection.Builder setSignature(java.lang.String);













    method public android.view.textclassifier.TextSelection.Builder setId(java.lang.String);















  }



























  public static final class TextSelection.Options implements android.os.Parcelable {













    ctor public TextSelection.Options();













  public static final class TextSelection.Request implements android.os.Parcelable {















    method public int describeContents();















    method public android.os.LocaleList getDefaultLocales();













    method public android.view.textclassifier.TextSelection.Options setDefaultLocales(android.os.LocaleList);













    method public int getEndIndex();













    method public int getStartIndex();













    method public java.lang.CharSequence getText();















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













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextSelection.Options> CREATOR;













    field public static final android.os.Parcelable.Creator<android.view.textclassifier.TextSelection.Request> CREATOR;













  }

























  public static final class TextSelection.Request.Builder {













    ctor public TextSelection.Request.Builder(java.lang.CharSequence, int, int);













    method public android.view.textclassifier.TextSelection.Request build();













    method public android.view.textclassifier.TextSelection.Request.Builder setDefaultLocales(android.os.LocaleList);















  }





























}

























api/removed.txt



+0
−5




























Original line number
Diff line number
Diff line








@@ -169,11 +169,6 @@ package android.graphics {













    method public deprecated boolean clipRegion(android.graphics.Region, android.graphics.Region.Op);















    method public deprecated boolean clipRegion(android.graphics.Region);















    method public deprecated int save(int);













    method public deprecated int saveLayer(android.graphics.RectF, android.graphics.Paint, int);













    method public deprecated int saveLayer(float, float, float, float, android.graphics.Paint, int);













    method public deprecated int saveLayerAlpha(android.graphics.RectF, int, int);













    method public deprecated int saveLayerAlpha(float, float, float, float, int, int);













    field public static final int ALL_SAVE_FLAG = 31; // 0x1f















    field public static final deprecated int CLIP_SAVE_FLAG = 2; // 0x2















    field public static final deprecated int CLIP_TO_LAYER_SAVE_FLAG = 16; // 0x10















    field public static final deprecated int FULL_COLOR_LAYER_SAVE_FLAG = 8; // 0x8

































api/system-current.txt



+6
−4


























File changed.
Preview size limit exceeded, changes collapsed.
























api/test-current.txt



+6
−0




























Original line number
Diff line number
Diff line








@@ -779,6 +779,12 @@ package android.telephony {













    method public void setCdmaSystemAndNetworkId(int, int);















  }





























  public class TelephonyManager {













    method public int getCarrierIdListVersion();













    method public void setCarrierTestOverride(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);













    field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff













  }





























}































package android.telephony.mbms {

































cmds/incident_helper/src/TextParserBase.cpp



+0
−1




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@













#include <android-base/file.h>































using namespace android::base;













using namespace std;































// ================================================================================















status_t NoopParser::Parse(const int in, const int out) const