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

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

Snap for 10262100 from dc0a6563 to udc-release 

Change-Id: If1ca63be1c331975bfff7030b1e790b75b63baff
parents 79059121 dc0a6563

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/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5035,8 +5035,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>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -2533,7 +2533,7 @@ 
  <java-symbol type="string" name="zen_mode_default_events_name" />

  <java-symbol type="string" name="zen_mode_default_every_night_name" />

  <java-symbol type="string" name="display_rotation_camera_compat_toast_after_rotation" />

  <java-symbol type="string" name="display_rotation_camera_compat_toast_in_split_screen" />

  <java-symbol type="string" name="display_rotation_camera_compat_toast_in_multi_window" />

  <java-symbol type="array" name="config_system_condition_providers" />

  <java-symbol type="string" name="muted_by" />

  <java-symbol type="string" name="zen_mode_alarm" />

data/etc/services.core.protolog.json

+6 −0
Original line number Diff line number Diff line
@@ -1813,6 +1813,12 @@ 
      "group": "WM_DEBUG_KEEP_SCREEN_ON",

      "at": "com\/android\/server\/wm\/RootWindowContainer.java"

    },

    "-479665533": {

      "message": "DisplayRotationCompatPolicy: Multi-window toast not shown as package '%s' cannot be found.",

      "level": "ERROR",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"

    },

    "-464564167": {

      "message": "Current transition prevents automatic focus change",

      "level": "VERBOSE",