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

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

Snap for 64573113 from 4ad02bca to mainline-release 

Change-Id: I3e42999630d2da64e629535052852b608773921d
parents 1724263e 4ad02bca

cmds/bootanimation/bootanim.rc

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ service bootanim /system/bin/bootanimation 
    disabled

    oneshot

    ioprio rt 0

    writepid /dev/stune/top-app/tasks
 
    task_profiles MaxPerformance

core/java/android/bluetooth/BluetoothProfileConnector.java

+15 −9
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public abstract class BluetoothProfileConnector<T> { 


    private void doUnbind() {

        synchronized (mConnection) {

            try {

                if (mService != null) {

                    logDebug("Unbinding service...");

                    try {
@@ -113,6 +114,12 @@ public abstract class BluetoothProfileConnector<T> { 
                        mService = null;

                    }

                }

            } finally {

                if (mServiceListener != null) {

                    mServiceListener.onServiceDisconnected(mProfileId);

                    mServiceListener = null;

                }

            }

        }

    }
@@ -131,7 +138,6 @@ public abstract class BluetoothProfileConnector<T> { 
    }



    void disconnect() {

        mServiceListener = null;

        IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();

        if (mgr != null) {

            try {

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

+3 −0
Original line number Diff line number Diff line
@@ -5526,6 +5526,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // timeout should not be caused by this.

        if (stopped) {

            final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack();

            if (stack == null) {

                return this;

            }

            // Try to use the one which is closest to top.

            ActivityRecord r = stack.getResumedActivity();

            if (r == null) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ class ActivityStarter { 


        // If we are starting an activity that is not from the same uid as the currently resumed

        // one, check whether app switches are allowed.

        if (voiceSession == null && (stack.getResumedActivity() == null

        if (voiceSession == null && stack != null && (stack.getResumedActivity() == null

                || stack.getResumedActivity().info.applicationInfo.uid != realCallingUid)) {

            if (!mService.checkAppSwitchAllowedLocked(callingPid, callingUid,

                    realCallingPid, realCallingUid, "Activity start")) {