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

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

Snap for 10261816 from fa49bb02 to udc-qpr1-release 

Change-Id: I3df08aa8989150bfa327b1ee2c103464d378670c
parents 015e0863 fa49bb02

core/java/android/os/image/DynamicSystemClient.java

+7 −0
Original line number Diff line number Diff line
@@ -209,6 +209,13 @@ public class DynamicSystemClient { 
    public static final String ACTION_HIDE_NOTIFICATION =

            "android.os.image.action.HIDE_NOTIFICATION";



    /**

     * Intent action: notify the service to post a status update when keyguard is dismissed.

     * @hide

     */

    public static final String ACTION_NOTIFY_KEYGUARD_DISMISSED =

            "android.os.image.action.NOTIFY_KEYGUARD_DISMISSED";



    /*

     * Intent Keys

     */

core/java/android/print/PrintManager.java

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.app.Activity;

import android.app.ActivityOptions;

import android.app.Application.ActivityLifecycleCallbacks;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;
@@ -535,7 +536,11 @@ public final class PrintManager { 
                    return null;

                }

                try {

                    mContext.startIntentSender(intent, null, 0, 0, 0);

                    ActivityOptions activityOptions = ActivityOptions.makeBasic()

                            .setPendingIntentBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                    mContext.startIntentSender(intent, null, 0, 0, 0,

                            activityOptions.toBundle());

                    return new PrintJob(printJob, this);

                } catch (SendIntentException sie) {

                    Log.e(LOG_TAG, "Couldn't start print job config activity.", sie);

core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ public class SystemUiSystemPropertiesFlags { 
        /** Gating the logging of DND state change events. */

        public static final Flag LOG_DND_STATE_EVENTS =

                releasedFlag("persist.sysui.notification.log_dnd_state_events");



        /** Gating the holding of WakeLocks until NLSes are told about a new notification. */

        public static final Flag WAKE_LOCK_FOR_POSTING_NOTIFICATION =

                devFlag("persist.sysui.notification.wake_lock_for_posting_notification");

    }



    //// == End of flags.  Everything below this line is the implementation. == ////

core/res/res/values/config_telephony.xml

+6 −0
Original line number Diff line number Diff line
@@ -167,4 +167,10 @@ 
         true, routing from the android emergency number database will be ignored. -->

    <bool name="ignore_emergency_number_routing_from_db">false</bool>

    <java-symbol type="bool" name="ignore_emergency_number_routing_from_db" />



    <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach

         data profile -->

    <bool name="allow_clear_initial_attach_data_profile">false</bool>

    <java-symbol type="bool" name="allow_clear_initial_attach_data_profile" />



</resources>

core/res/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -1789,6 +1789,8 @@ 
    <string name="biometric_error_user_canceled">Authentication canceled</string>

    <!-- Message shown by the biometric dialog when biometric is not recognized -->

    <string name="biometric_not_recognized">Not recognized</string>

    <!-- Message shown by the biometric dialog when face is not recognized [CHAR LIMIT=50] -->

    <string name="biometric_face_not_recognized">Face not recognized</string>

    <!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] -->

    <string name="biometric_error_canceled">Authentication canceled</string>

    <!-- Message returned to applications if BiometricPrompt setAllowDeviceCredentials is enabled but no pin, pattern, or password is set. [CHAR LIMIT=NONE] -->
@@ -5035,8 +5037,8 @@ 
    <string name="display_rotation_camera_compat_toast_after_rotation">Rotate for a better view</string>



    <!-- Text on a toast shown when a camera view is started within the app that may not be able

         to display the camera preview correctly while in split screen. [CHAR LIMIT=NONE] -->

    <string name="display_rotation_camera_compat_toast_in_split_screen">Exit split screen for a better view</string>

         to display the camera preview correctly while in multi-window. [CHAR LIMIT=NONE] -->

    <string name="display_rotation_camera_compat_toast_in_multi_window">Open <xliff:g id="name" example="MyApp">%s</xliff:g> in full screen for a better view</string>



    <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->

    <string name="done_label">Done</string>