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

Merge "Fix Hotspot tile is shown on Guest user"

Browse Source
This commit is contained in:
Jason Monk
2016-12-06 15:11:18 +00:00
committed by Gerrit Code Review
parent 5014028691 efd1c54a40
commit 9600df035b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,16 +335,24 @@ 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);
newTiles.put(tileSpec, tile); tile.removeCallbacks();
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) {
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);