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

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

Snap for 8680934 from c88cdc85 to tm-qpr1-release 

Change-Id: I85fc42bb585a8225dc84b3dad5b34683f866b6c3
parents 1f877b57 c88cdc85

core/java/android/hardware/display/DisplayManagerInternal.java

+13 −2
Original line number Diff line number Diff line
@@ -569,8 +569,19 @@ public abstract class DisplayManagerInternal { 
        void onProximityNegative();

        void onDisplayStateChange(boolean allInactive, boolean allOff);



        void acquireSuspendBlocker();

        void releaseSuspendBlocker();

        /**

         * Acquires a suspend blocker with a specified label.

         *

         * @param id A logging label for the acquisition.

         */

        void acquireSuspendBlocker(String id);



        /**

         * Releases a suspend blocker with a specified label.

         *

         * @param id A logging label for the release.

         */

        void releaseSuspendBlocker(String id);

    }



    /**

core/java/android/net/VpnManager.java

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,12 @@ public class VpnManager { 
    /**

     * Action sent in {@link android.content.Intent}s to VpnManager clients when an event occurred.

     *

     * <p>If the provisioning application declares a service handling this intent action, but is not

     * already running, it will be started. Upon starting, the application is granted a short grace

     * period to run in the background even while the device is idle to handle any potential

     * failures. Applications requiring long-running actions triggered by one of these events should

     * declare a foreground service to prevent being killed once the grace period expires.

     *

     * This action will have a category of either {@link #CATEGORY_EVENT_IKE_ERROR},

     * {@link #CATEGORY_EVENT_NETWORK_ERROR}, or {@link #CATEGORY_EVENT_DEACTIVATED_BY_USER},

     * that the app can use to filter events it's interested in reacting to.

core/java/android/service/dreams/DreamService.java

+10 −12
Original line number Diff line number Diff line
@@ -1130,18 +1130,16 @@ public class DreamService extends Service implements Window.Callback { 


        final PackageManager pm = context.getPackageManager();



        final TypedArray rawMetadata = readMetadata(pm, serviceInfo);

        try (TypedArray rawMetadata = readMetadata(pm, serviceInfo)) {

            if (rawMetadata == null) return null;



        final DreamMetadata metadata = new DreamMetadata(

            return new DreamMetadata(

                    convertToComponentName(rawMetadata.getString(

                            com.android.internal.R.styleable.Dream_settingsActivity), serviceInfo),

                    rawMetadata.getDrawable(

                            com.android.internal.R.styleable.Dream_previewImage),

                    rawMetadata.getBoolean(R.styleable.Dream_showClockAndComplications,

                            DEFAULT_SHOW_COMPLICATIONS));

        rawMetadata.recycle();

        return metadata;

        }

    }



    /**

core/java/com/android/internal/jank/InteractionJankMonitor.java

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_MEDIA_PLAYER;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_QS_TILE;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_DIALOG_OPEN;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_COLLAPSE_LOCK;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_APPEAR;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_DISAPPEAR;
@@ -75,6 +76,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TAKE_SCREENSHOT;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_DIALOG_OPEN;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_SWITCH;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WALLPAPER_TRANSITION;
@@ -202,6 +204,8 @@ public class InteractionJankMonitor { 
    public static final int CUJ_VOLUME_CONTROL = 55;

    public static final int CUJ_BIOMETRIC_PROMPT_TRANSITION = 56;

    public static final int CUJ_SETTINGS_TOGGLE = 57;

    public static final int CUJ_SHADE_DIALOG_OPEN = 58;

    public static final int CUJ_USER_DIALOG_OPEN = 59;



    private static final int NO_STATSD_LOGGING = -1;
@@ -268,6 +272,8 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BIOMETRIC_PROMPT_TRANSITION,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SETTINGS_TOGGLE,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_DIALOG_OPEN,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_DIALOG_OPEN,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -346,6 +352,8 @@ public class InteractionJankMonitor { 
            CUJ_VOLUME_CONTROL,

            CUJ_BIOMETRIC_PROMPT_TRANSITION,

            CUJ_SETTINGS_TOGGLE,

            CUJ_SHADE_DIALOG_OPEN,

            CUJ_USER_DIALOG_OPEN,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -780,6 +788,10 @@ public class InteractionJankMonitor { 
                return "BIOMETRIC_PROMPT_TRANSITION";

            case CUJ_SETTINGS_TOGGLE:

                return "SETTINGS_TOGGLE";

            case CUJ_SHADE_DIALOG_OPEN:

                return "SHADE_DIALOG_OPEN";

            case CUJ_USER_DIALOG_OPEN:

                return "USER_DIALOG_OPEN";

        }

        return "UNKNOWN";

    }

core/java/com/android/internal/statusbar/IStatusBar.aidl

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ oneway interface IStatusBar 
     * Displays a text toast.

     */

    void showToast(int uid, String packageName, IBinder token, CharSequence text,

            IBinder windowToken, int duration, @nullable ITransientNotificationCallback callback);

            IBinder windowToken, int duration, @nullable ITransientNotificationCallback callback,

            int displayId);



    /**

     * Cancels toast with token {@code token} in {@code packageName}.