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

Browse Source 
am: f120cf3d88

Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d
This commit is contained in:
Jason Monk
2016-12-06 16:43:38 +00:00
committed by android-build-merger
parent fee17700af f120cf3d88
commit 99db203f29
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 (tile.isAvailable()) {
if (DEBUG) Log.d(TAG, "Adding " + tile); if (DEBUG) Log.d(TAG, "Adding " + tile);
tile.removeCallbacks(); tile.removeCallbacks();
if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) { if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) {
tile.userSwitch(currentUser); tile.userSwitch(currentUser);
} }
newTiles.put(tileSpec, tile); newTiles.put(tileSpec, tile);
} else {
tile.destroy();
}
} 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) {
if (tile.isAvailable()) {
tile.setTileSpec(tileSpec); tile.setTileSpec(tileSpec);
newTiles.put(tileSpec, tile); 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);