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

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

Snap for 5511022 from 777341da to qt-release 

Change-Id: I4b5c8fd25546015cc9962211104f4ea817e362df
parents b7870cb1 777341da

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ java_defaults { 
        "core/java/android/service/vr/IVrManager.aidl",

        "core/java/android/service/vr/IVrStateCallbacks.aidl",

        "core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",

        "core/java/android/service/watchdog/PackageInfo.aidl",

        "core/java/android/service/watchdog/PackageConfig.aidl",

        "core/java/android/print/ILayoutResultCallback.aidl",

        "core/java/android/print/IPrinterDiscoveryObserver.aidl",

        "core/java/android/print/IPrintDocumentAdapter.aidl",

api/system-current.txt

+14 −15
Original line number Diff line number Diff line
@@ -5659,18 +5659,17 @@ package android.permission { 














  public abstract class PermissionControllerService extends android.app.Service {















    ctor public PermissionControllerService();













    method public final void attachBaseContext(android.content.Context);















    method @NonNull public final android.os.IBinder onBind(android.content.Intent);













    method @WorkerThread public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);













    method @WorkerThread @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);













    method @WorkerThread @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);













    method @WorkerThread public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream);













    method @WorkerThread public abstract void onGrantOrUpgradeDefaultRuntimePermissions();













    method @BinderThread public abstract boolean onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle);













    method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream);













    method @WorkerThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String);













    method @WorkerThread @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String);













    method @WorkerThread public abstract boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int);













    method @BinderThread public abstract void onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int, @NonNull java.util.function.IntConsumer);













    method @BinderThread public abstract void onGetAppPermissions(@NonNull String, @NonNull java.util.function.Consumer<java.util.List<android.permission.RuntimePermissionPresentationInfo>>);













    method @BinderThread public abstract void onGetPermissionUsages(boolean, long, @NonNull java.util.function.Consumer<java.util.List<android.permission.RuntimePermissionUsageInfo>>);













    method @BinderThread public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream, @NonNull Runnable);













    method @BinderThread public abstract void onGrantOrUpgradeDefaultRuntimePermissions(@NonNull Runnable);













    method @BinderThread public abstract void onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.function.Consumer<java.lang.Boolean>);













    method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);













    method @BinderThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String, @NonNull Runnable);













    method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);













    method @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);















    field public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";















  }
























@@ -6839,19 +6838,19 @@ package android.service.watchdog {













    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);















    method public abstract void onCancelHealthCheck(@NonNull String);















    method @NonNull public abstract java.util.List<java.lang.String> onGetRequestedPackages();













    method @NonNull public abstract java.util.List<android.service.watchdog.PackageInfo> onGetSupportedPackages();













    method @NonNull public abstract java.util.List<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> onGetSupportedPackages();















    method public abstract void onRequestHealthCheck(@NonNull String);















    field public static final String BIND_PERMISSION = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";















    field public static final String SERVICE_INTERFACE = "android.service.watchdog.ExplicitHealthCheckService";















  }



























  public final class PackageInfo implements android.os.Parcelable {













    ctor public PackageInfo(@NonNull String, long);













  public static final class ExplicitHealthCheckService.PackageConfig implements android.os.Parcelable {













    ctor public ExplicitHealthCheckService.PackageConfig(@NonNull String, long);















    method public int describeContents();















    method public long getHealthCheckTimeoutMillis();















    method @NonNull public String getPackageName();















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













    field @NonNull public static final android.os.Parcelable.Creator<android.service.watchdog.PackageInfo> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> CREATOR;















  }





























}

































api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -117,6 +117,7 @@ package android.app {













    method public void startActivity(@NonNull android.content.Intent);















    method public void startActivity(@NonNull android.content.Intent, android.os.UserHandle);















    method public void startActivity(@NonNull android.app.PendingIntent);













    method public void startActivity(@NonNull android.app.PendingIntent, @NonNull android.app.ActivityOptions);















  }































  public abstract static class ActivityView.StateCallback {










@@ -369,6 +370,7 @@ package android.app {













    method public android.os.ParcelFileDescriptor[] executeShellCommandRw(String);















    method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle);















    method @Deprecated public boolean revokeRuntimePermission(String, String, android.os.UserHandle);













    method public void syncInputTransactions();















  }































  public class UiModeManager {

































cmds/incidentd/src/Privacy.cpp



+5
−1




























Original line number
Diff line number
Diff line








@@ -25,6 +25,8 @@ namespace incidentd {





























using namespace android::os;





























static const bool kEncryptionEnabled = false;





























uint64_t encode_field_id(const Privacy* p) { return (uint64_t)p->type << 32 | p->field_id; }































const Privacy* lookup(const Privacy* p, uint32_t fieldId) {









@@ -37,7 +39,9 @@ const Privacy* lookup(const Privacy* p, uint32_t fieldId) {













    return NULL;















}





























bool sectionEncryption(int section_id) { return section_id == 3025 /*restricted image section*/; }













bool sectionEncryption(int section_id) {













    return kEncryptionEnabled ? (section_id == 3025) /*restricted image section*/ : false;













}































static bool isAllowed(const uint8_t policy, const uint8_t check) {















    switch (check) {

































cmds/statsd/src/StatsLogProcessor.h



+3
−0




























Original line number
Diff line number
Diff line








@@ -235,9 +235,12 @@ private:













    FRIEND_TEST(GaugeMetricE2eTest, TestMultipleFieldsForPushedEvent);















    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents);















    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm);













    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation);













    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition);















    FRIEND_TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents);















    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);















    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);













    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);































    FRIEND_TEST(DimensionInConditionE2eTest, TestCreateCountMetric_NoLink_OR_CombinationCondition);















    FRIEND_TEST(DimensionInConditionE2eTest, TestCreateCountMetric_Link_OR_CombinationCondition);