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

Commit 8e9440ef authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

resolve merge conflicts of 9600df03 to stage-aosp-master am: f120cf3d am: 99db203f 

am: 14e55354

Change-Id: Icf3490bfe111607ae1711ceef8ade55ed0b35ec9
parents 8a004a42 14e55354

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

+9 −5
Original line number Diff line number Diff line
@@ -335,12 +335,16 @@ public class QSTileHost implements QSTile.Host, Tunable { 
            QSTile<?> tile = mTiles.get(tileSpec);

            if (tile != null && (!(tile instanceof CustomTile)

                    || ((CustomTile) tile).getUser() == currentUser)) {

                if (tile.isAvailable()) {

                    if (DEBUG) Log.d(TAG, "Adding " + tile);

                    tile.removeCallbacks();

                    if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) {

                        tile.userSwitch(currentUser);

                    }

                    newTiles.put(tileSpec, tile);

                } else {

                    tile.destroy();

                }

            } else {

                if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec);

                try {