resolve merge conflicts of 9600df0 to stage-aosp-master (99db203f) · Commits · e / os / android_frameworks_base

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -332,19 +332,27 @@ 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 {
		tile = createTile(tileSpec);
		if (tile != null && tile.isAvailable()) {
		if (tile != null) {
		if (tile.isAvailable()) {
		tile.setTileSpec(tileSpec);
		newTiles.put(tileSpec, tile);
		} else {
		tile.destroy();
		}
		}
		} catch (Throwable t) {
		Log.w(TAG, "Error creating tile for spec: " + tileSpec, t);