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

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

Snap for 8756258 from 75c201f9 to tm-release 

Change-Id: Ia27ec732f313673534558c5af9bdb81589b8d42a
parents 5e8efe47 75c201f9

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -2940,7 +2940,7 @@ 


    <!-- System bluetooth stack package name -->

    <string name="config_systemBluetoothStack" translatable="false">

        com.android.bluetooth.services

        com.android.bluetooth

    </string>



    <!-- Flag indicating that the media framework should not allow changes or mute on any

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+30 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ import static androidx.window.util.ExtensionHelper.transformToWindowSpaceRect; 


import android.annotation.Nullable;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManager.AppTask;

import android.app.Application;

import android.app.WindowConfiguration;

import android.content.Context;

import android.graphics.Rect;

import android.os.Bundle;
@@ -183,7 +186,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
            return features;

        }



        if (activity.isInMultiWindowMode()) {

        if (isTaskInMultiWindowMode(activity)) {

            // It is recommended not to report any display features in multi-window mode, since it

            // won't be possible to synchronize the display feature positions with window movement.

            return features;
@@ -209,6 +212,32 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
        return features;

    }



    /**

     * Checks whether the task associated with the activity is in multi-window. If task info is not

     * available it defaults to {@code true}.

     */

    private boolean isTaskInMultiWindowMode(@NonNull Activity activity) {

        final ActivityManager am = activity.getSystemService(ActivityManager.class);

        if (am == null) {

            return true;

        }



        final List<AppTask> appTasks = am.getAppTasks();

        final int taskId = activity.getTaskId();

        AppTask task = null;

        for (AppTask t : appTasks) {

            if (t.getTaskInfo().taskId == taskId) {

                task = t;

                break;

            }

        }

        if (task == null) {

            // The task might be removed on the server already.

            return true;

        }

        return WindowConfiguration.inMultiWindowMode(task.getTaskInfo().getWindowingMode());

    }



    /**

     * Returns {@link true} if a {@link Rect} has zero width and zero height,

     * {@code false} otherwise.

packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public abstract class MediaManager { 
    private static final String TAG = "MediaManager";



    protected final Collection<MediaDeviceCallback> mCallbacks = new CopyOnWriteArrayList<>();

    protected final List<MediaDevice> mMediaDevices = new ArrayList<>();

    protected final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>();



    protected Context mContext;

    protected Notification mNotification;

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class Flags { 


    /***************************************/

    // 900 - media

    public static final BooleanFlag MEDIA_TAP_TO_TRANSFER = new BooleanFlag(900, false);

    public static final BooleanFlag MEDIA_TAP_TO_TRANSFER = new BooleanFlag(900, true);

    public static final BooleanFlag MEDIA_SESSION_ACTIONS = new BooleanFlag(901, false);

    public static final BooleanFlag MEDIA_NEARBY_DEVICES = new BooleanFlag(903, true);

    public static final BooleanFlag MEDIA_MUTE_AWAIT = new BooleanFlag(904, true);