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

Commit d97f1e49 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7173881 from f8501da3 to rvc-qpr3-release 

Change-Id: Ice12b19c553adbfa8f575877d2f699a2583a43f5
parents 0809163e f8501da3

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+3 −2
Original line number Diff line number Diff line
@@ -543,12 +543,13 @@ public class LocalBluetoothProfileManager { 
            mPbapProfile.setEnabled(device, true);

        }



        if (mMapClientProfile != null) {

        if ((mMapClientProfile != null)

                && BluetoothUuid.containsAnyUuid(uuids, MapClientProfile.UUIDS)) {

            profiles.add(mMapClientProfile);

            removedProfiles.remove(mMapClientProfile);

        }



        if ((mPbapClientProfile != null) && ArrayUtils.contains(localUuids, BluetoothUuid.PBAP_PCE)

        if ((mPbapClientProfile != null)

                && BluetoothUuid.containsAnyUuid(uuids, PbapClientProfile.SRC_UUIDS)) {

            profiles.add(mPbapClientProfile);

            removedProfiles.remove(mPbapClientProfile);

packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
    private final LocalBluetoothProfileManager mProfileManager;



    static final ParcelUuid[] UUIDS = {

        BluetoothUuid.MAP,

        BluetoothUuid.MNS,

        BluetoothUuid.MAS,

    };

services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java

+1 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;



import static com.android.server.wm.ActivityStack.TAG_VISIBILITY;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_VISIBILITY;
@@ -174,12 +172,7 @@ class EnsureActivitiesVisibleHelper { 
        }



        final int windowingMode = mContiner.getWindowingMode();

        if (windowingMode == WINDOWING_MODE_FREEFORM) {

            // The visibility of tasks and the activities they contain in freeform stack are

            // determined individually unlike other stacks where the visibility or fullscreen

            // status of an activity in a previous task affects other.

            mBehindFullscreenActivity = !mContainerShouldBeVisible;

        } else if (!mBehindFullscreenActivity && mContiner.isActivityTypeHome()

        if (!mBehindFullscreenActivity && mContiner.isActivityTypeHome()

                && r.isRootOfTask()) {

            if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Home task: at " + mContiner

                    + " stackShouldBeVisible=" + mContainerShouldBeVisible