Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88

Browse Source 
am: 99db203f29

Change-Id: I908b554d4ec2adcec6c6d95c768153bcab569cbf
This commit is contained in:
Jason Monk
2016-12-06 16:49:54 +00:00
committed by android-build-merger
parent be1ea967f0 99db203f29
commit 14e55354c2
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,19 +332,27 @@ public class QSTileHost implements QSTile.Host, Tunable {
QSTile<?> tile = mTiles.get(tileSpec); QSTile<?> tile = mTiles.get(tileSpec);
if (tile != null && (!(tile instanceof CustomTile) if (tile != null && (!(tile instanceof CustomTile)
|| ((CustomTile) tile).getUser() == currentUser)) { || ((CustomTile) tile).getUser() == currentUser)) {
if (DEBUG) Log.d(TAG, "Adding " + tile); if (tile.isAvailable()) {
tile.removeCallbacks(); if (DEBUG) Log.d(TAG, "Adding " + tile);
if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) { tile.removeCallbacks();
tile.userSwitch(currentUser); if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) {
tile.userSwitch(currentUser);
}
newTiles.put(tileSpec, tile);
} else {
tile.destroy();
} }
newTiles.put(tileSpec, tile);
} else { } else {
if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec); if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec);
try { try {
tile = createTile(tileSpec); tile = createTile(tileSpec);
if (tile != null && tile.isAvailable()) { if (tile != null) {
tile.setTileSpec(tileSpec); if (tile.isAvailable()) {
newTiles.put(tileSpec, tile); tile.setTileSpec(tileSpec);
newTiles.put(tileSpec, tile);
} else {
tile.destroy();
}
} }
} catch (Throwable t) { } catch (Throwable t) {
Log.w(TAG, "Error creating tile for spec: " + tileSpec, t); Log.w(TAG, "Error creating tile for spec: " + tileSpec, t);