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

Commit 560d94ff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11162593 from caa63d0a to 24Q1-release 

Change-Id: I4186abc484619db791c05fdaba8f59b6a9a75a45
parents b67521b9 caa63d0a

Ravenwood.bp

+5 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ java_genrule { 
    cmd: "$(location hoststubgen) " +

        "@$(location ravenwood/ravenwood-standard-options.txt) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +
@@ -52,6 +54,8 @@ java_genrule { 
        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",



        "hoststubgen_framework-minus-apex.log",

    ],

    visibility: ["//visibility:private"],

}
@@ -80,7 +84,7 @@ android_ravenwood_libgroup { 
        "junit",

        "truth",

        "ravenwood-junit-impl",

        "android.test.mock",

        "android.test.mock.ravenwood",

    ],

}

apex/jobscheduler/service/aconfig/job.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
    description: "Only relax a prefetch job's connectivity constraint when the device is charging and battery is not low"

    bug: "299329948"

}



flag {

    name: "throw_on_unsupported_bias_usage"

    namespace: "backstage_power"

    description: "Throw an exception if an unsupported app uses JobInfo.setBias"

    bug: "300477393"

}
 
 No newline at end of file

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -2163,6 +2163,8 @@ public class AlarmManagerService extends SystemService { 
                    mActivityManagerInternal.getBootTimeTempAllowListDuration(),

                    TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                    PowerExemptionManager.REASON_TIMEZONE_CHANGED, "");

            mOptsTimeBroadcast.setDeliveryGroupPolicy(

                    BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT);

            getContext().sendBroadcastAsUser(intent, UserHandle.ALL,

                    null /* receiverPermission */, mOptsTimeBroadcast.toBundle());

        }
@@ -4608,6 +4610,8 @@ public class AlarmManagerService extends SystemService { 
                                mActivityManagerInternal.getBootTimeTempAllowListDuration(),

                                TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

                                PowerExemptionManager.REASON_TIME_CHANGED, "");

                        mOptsTimeBroadcast.setDeliveryGroupPolicy(

                                BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT);

                        getContext().sendBroadcastAsUser(intent, UserHandle.ALL,

                                null /* receiverPermission */, mOptsTimeBroadcast.toBundle());

                        // The world has changed on us, so we need to re-evaluate alarms

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+2 −1
Original line number Diff line number Diff line
@@ -4358,7 +4358,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
        private JobInfo enforceBuilderApiPermissions(int uid, int pid, JobInfo job) {

            if (job.getBias() != JobInfo.BIAS_DEFAULT

                        && !hasPermission(uid, pid, Manifest.permission.UPDATE_DEVICE_STATS)) {

                if (CompatChanges.isChangeEnabled(THROW_ON_UNSUPPORTED_BIAS_USAGE, uid)) {

                if (CompatChanges.isChangeEnabled(THROW_ON_UNSUPPORTED_BIAS_USAGE, uid)

                        && Flags.throwOnUnsupportedBiasUsage()) {

                    throw new SecurityException("Apps may not call setBias()");

                } else {

                    // We can't throw the exception. Log the issue and modify the job to remove

core/api/current.txt

+13 −8
Original line number Diff line number Diff line
@@ -39264,7 +39264,7 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityStart();

    method @NonNull public String getKeystoreAlias();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();
@@ -39272,7 +39272,7 @@ package android.security.keystore { 
    method public boolean isDevicePropertiesAttestationIncluded();

    method @NonNull public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isStrongBoxBacked();

    method public boolean isUnlockedDeviceRequired();
@@ -39304,7 +39304,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date);

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

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMgf1Digests(@NonNull java.lang.String...);

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setMgf1Digests(@NonNull java.lang.String...);

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

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

    method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUnlockedDeviceRequired(boolean);
@@ -39409,14 +39409,14 @@ package android.security.keystore { 
    method @Nullable public java.util.Date getKeyValidityForOriginationEnd();

    method @Nullable public java.util.Date getKeyValidityStart();

    method public int getMaxUsageCount();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public java.util.Set<java.lang.String> getMgf1Digests();

    method public int getPurposes();

    method @NonNull public String[] getSignaturePaddings();

    method public int getUserAuthenticationType();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public boolean isMgf1DigestsSpecified();

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public boolean isMgf1DigestsSpecified();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUnlockedDeviceRequired();

    method public boolean isUserAuthenticationRequired();
@@ -39438,7 +39438,7 @@ package android.security.keystore { 
    method @NonNull public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

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

    method @NonNull public android.security.keystore.KeyProtection.Builder setMaxUsageCount(int);

    method @FlaggedApi("MGF1_DIGEST_SETTER") @NonNull public android.security.keystore.KeyProtection.Builder setMgf1Digests(@Nullable java.lang.String...);

    method @FlaggedApi("android.security.mgf1_digest_setter") @NonNull public android.security.keystore.KeyProtection.Builder setMgf1Digests(@Nullable java.lang.String...);

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

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

    method @NonNull public android.security.keystore.KeyProtection.Builder setUnlockedDeviceRequired(boolean);
@@ -43136,8 +43136,8 @@ package android.telephony { 
    field public static final String KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrq_thresholds_int_array";

    field public static final String KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY = "5g_nr_sssinr_thresholds_int_array";

    field public static final String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool";

    field public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = "additional_settings_call_waiting_visibility_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.show_call_id_and_call_waiting_in_additional_settings_menu") public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.show_call_id_and_call_waiting_in_additional_settings_menu") public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = "additional_settings_call_waiting_visibility_bool";

    field public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";

    field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
@@ -52054,6 +52054,7 @@ package android.view { 
    method public float getHandwritingBoundsOffsetLeft();

    method public float getHandwritingBoundsOffsetRight();

    method public float getHandwritingBoundsOffsetTop();

    method @FlaggedApi("android.view.inputmethod.home_screen_handwriting_delegator") public int getHandwritingDelegateFlags();

    method @Nullable public Runnable getHandwritingDelegatorCallback();

    method public final boolean getHasOverlappingRendering();

    method public final int getHeight();
@@ -52427,6 +52428,7 @@ package android.view { 
    method public void setForegroundTintMode(@Nullable android.graphics.PorterDuff.Mode);

    method @FlaggedApi("android.view.flags.view_velocity_api") public void setFrameContentVelocity(float);

    method public void setHandwritingBoundsOffsets(float, float, float, float);

    method @FlaggedApi("android.view.inputmethod.home_screen_handwriting_delegator") public void setHandwritingDelegateFlags(int);

    method public void setHandwritingDelegatorCallback(@Nullable Runnable);

    method public void setHapticFeedbackEnabled(boolean);

    method public void setHasTransientState(boolean);
@@ -55682,6 +55684,7 @@ package android.view.inputmethod { 
  public final class InputMethodManager {

    method public boolean acceptStylusHandwritingDelegation(@NonNull android.view.View);

    method public boolean acceptStylusHandwritingDelegation(@NonNull android.view.View, @NonNull String);

    method @FlaggedApi("android.view.inputmethod.home_screen_handwriting_delegator") public boolean acceptStylusHandwritingDelegation(@NonNull android.view.View, @NonNull String, int);

    method public void dispatchKeyEventFromInputMethod(@Nullable android.view.View, @NonNull android.view.KeyEvent);

    method public void displayCompletions(android.view.View, android.view.inputmethod.CompletionInfo[]);

    method @Nullable public android.view.inputmethod.InputMethodInfo getCurrentInputMethodInfo();
@@ -55729,6 +55732,7 @@ package android.view.inputmethod { 
    method public void updateExtractedText(android.view.View, int, android.view.inputmethod.ExtractedText);

    method public void updateSelection(android.view.View, int, int, int, int);

    method @Deprecated public void viewClicked(android.view.View);

    field @FlaggedApi("android.view.inputmethod.home_screen_handwriting_delegator") public static final int HANDWRITING_DELEGATE_FLAG_HOME_DELEGATOR_ALLOWED = 1; // 0x1

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

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

    field public static final int RESULT_HIDDEN = 3; // 0x3
@@ -59546,6 +59550,7 @@ package android.widget { 
    method public void setOnClickFillInIntent(@IdRes int, android.content.Intent);

    method public void setOnClickPendingIntent(@IdRes int, android.app.PendingIntent);

    method public void setOnClickResponse(@IdRes int, @NonNull android.widget.RemoteViews.RemoteResponse);

    method @FlaggedApi("android.view.inputmethod.home_screen_handwriting_delegator") public void setOnStylusHandwritingPendingIntent(@IdRes int, @Nullable android.app.PendingIntent);

    method public void setPendingIntentTemplate(@IdRes int, android.app.PendingIntent);

    method public void setProgressBar(@IdRes int, int, int, boolean);

    method public void setRadioGroupChecked(@IdRes int, @IdRes int);