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

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

Snap for 4713750 from 5f91d5ee to pi-release 

Change-Id: Idee2cec3cc7637085e818931fee6048f005a5a94
parents 366cd9c5 5f91d5ee

api/current.txt

+10 −8
Original line number Diff line number Diff line
@@ -7206,8 +7206,6 @@ package android.app.slice { 














  public final class Slice implements android.os.Parcelable {















    ctor protected Slice(android.os.Parcel);













    method public static deprecated android.app.slice.Slice bindSlice(android.content.ContentResolver, android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public static deprecated android.app.slice.Slice bindSlice(android.content.Context, android.content.Intent, java.util.List<android.app.slice.SliceSpec>);















    method public int describeContents();















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















    method public java.util.List<android.app.slice.SliceItem> getItems();










@@ -7297,15 +7295,18 @@ package android.app.slice {













  }





























  public class SliceManager {













    method public android.app.slice.Slice bindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public android.app.slice.Slice bindSlice(android.content.Intent, java.util.List<android.app.slice.SliceSpec>);













    method public android.app.slice.Slice bindSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice bindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public android.app.slice.Slice bindSlice(android.content.Intent, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice bindSlice(android.content.Intent, java.util.List<android.app.slice.SliceSpec>);















    method public int checkSlicePermission(android.net.Uri, int, int);















    method public java.util.List<android.net.Uri> getPinnedSlices();













    method public java.util.List<android.app.slice.SliceSpec> getPinnedSpecs(android.net.Uri);













    method public java.util.Set<android.app.slice.SliceSpec> getPinnedSpecs(android.net.Uri);















    method public java.util.Collection<android.net.Uri> getSliceDescendants(android.net.Uri);















    method public void grantSlicePermission(java.lang.String, android.net.Uri);















    method public android.net.Uri mapIntentToUri(android.content.Intent);













    method public void pinSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public void pinSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated void pinSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);















    method public void revokeSlicePermission(java.lang.String, android.net.Uri);















    method public void unpinSlice(android.net.Uri);















    field public static final java.lang.String CATEGORY_SLICE = "android.app.slice.category.SLICE";









@@ -7325,7 +7326,8 @@ package android.app.slice {













    method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);















    method public final java.lang.String getType(android.net.Uri);















    method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);













    method public android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);













    method public android.app.slice.Slice onBindSlice(android.net.Uri, java.util.Set<android.app.slice.SliceSpec>);













    method public deprecated android.app.slice.Slice onBindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);















    method public android.app.PendingIntent onCreatePermissionRequest(android.net.Uri);















    method public java.util.Collection<android.net.Uri> onGetSliceDescendants(android.net.Uri);















    method public android.net.Uri onMapIntentToUri(android.content.Intent);










@@ -7474,12 +7476,12 @@ package android.app.usage {



























  public static final class UsageEvents.Event {















    ctor public UsageEvents.Event();













    method public int getAppStandbyBucket();















    method public java.lang.String getClassName();















    method public android.content.res.Configuration getConfiguration();















    method public int getEventType();















    method public java.lang.String getPackageName();















    method public java.lang.String getShortcutId();













    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

























api/system-current.txt



+1
−2




























Original line number
Diff line number
Diff line








@@ -1027,7 +1027,6 @@ package android.content.pm {













    method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);















    method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);















    method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);













    method public android.os.PersistableBundle getSuspendedPackageAppExtras(java.lang.String);















    method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);















    method public abstract int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;















    method public abstract int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;









@@ -1039,7 +1038,6 @@ package android.content.pm {













    method public abstract boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);















    method public void setHarmfulAppWarning(java.lang.String, java.lang.CharSequence);















    method public java.lang.String[] setPackagesSuspended(java.lang.String[], boolean, android.os.PersistableBundle, android.os.PersistableBundle, java.lang.String);













    method public void setSuspendedPackageAppExtras(java.lang.String, android.os.PersistableBundle);















    method public abstract void setUpdateAvailable(java.lang.String, boolean);















    method public abstract boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);















    method public abstract void updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);










@@ -1255,6 +1253,7 @@ package android.hardware.display {













    method public android.hardware.display.BrightnessConfiguration getBrightnessConfiguration();















    method public java.util.List<android.hardware.display.BrightnessChangeEvent> getBrightnessEvents();















    method public android.hardware.display.BrightnessConfiguration getDefaultBrightnessConfiguration();













    method public android.util.Pair<float[], float[]> getMinimumBrightnessCurve();















    method public android.graphics.Point getStableDisplaySize();















    method public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);















    method public void setSaturationLevel(float);

































api/test-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -707,6 +707,14 @@ package android.security.keystore {













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















  }





























  public final class KeyProtection implements java.security.KeyStore.ProtectionParameter {













    method public long getBoundToSpecificSecureUserId();













  }



























  public static final class KeyProtection.Builder {













    method public android.security.keystore.KeyProtection.Builder setBoundToSpecificSecureUserId(long);













  }





























}































package android.service.autofill {

































cmds/statsd/Android.mk



+2
−0




























Original line number
Diff line number
Diff line








@@ -205,6 +205,8 @@ LOCAL_SRC_FILES := \













    tests/e2e/Alarm_e2e_test.cpp \















    tests/e2e/Attribution_e2e_test.cpp \















    tests/e2e/GaugeMetric_e2e_push_test.cpp \













    tests/e2e/GaugeMetric_e2e_pull_test.cpp \













    tests/e2e/ValueMetric_pull_e2e_test.cpp \















    tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp \















    tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp \















    tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp \

































cmds/statsd/benchmark/metric_util.cpp



+2
−1




























Original line number
Diff line number
Diff line








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













    sp<AlarmMonitor> anomalyAlarmMonitor;















    sp<AlarmMonitor> periodicAlarmMonitor;















    sp<StatsLogProcessor> processor = new StatsLogProcessor(













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













        uidMap, anomalyAlarmMonitor, periodicAlarmMonitor, timeBaseSec * NS_PER_SEC,













        [](const ConfigKey&){});















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















    return processor;















}