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

QS: Fix crash in tile API

Browse Source 
Change-Id: I9062839ab59236c20e35645701254ea2d24cc876
Fixes: 30224352
This commit is contained in:
Jason Monk
2016-07-20 10:18:09 -04:00
parent e723ed8b51
commit 016bc90331
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java vendored
View File

@@ -178,8 +178,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void updateQsTile(Tile tile, IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
synchronized (mServices) {
final TileServiceManager tileServiceManager = mServices.get(customTile);
tileServiceManager.clearPendingBind();
@@ -193,8 +193,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void onStartSuccessful(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
synchronized (mServices) {
final TileServiceManager tileServiceManager = mServices.get(customTile);
tileServiceManager.clearPendingBind();
@@ -206,8 +206,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void onShowDialog(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
customTile.onDialogShown();
mHost.collapsePanels();
mServices.get(customTile).setShowingDialog(true);
@@ -217,8 +217,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void onDialogHidden(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
mServices.get(customTile).setShowingDialog(false);
customTile.onDialogHidden();
}
@@ -227,8 +227,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void onStartActivity(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
mHost.collapsePanels();
}
}
@@ -236,8 +236,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void updateStatusIcon(IBinder token, Icon icon, String contentDescription) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
try {
ComponentName componentName = customTile.getComponent();
String packageName = componentName.getPackageName();
@@ -266,8 +266,8 @@ public class TileServices extends IQSService.Stub {
@Override
public Tile getTile(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
return customTile.getQsTile();
}
return null;
@@ -276,8 +276,8 @@ public class TileServices extends IQSService.Stub {
@Override
public void startUnlockAndRun(IBinder token) {
CustomTile customTile = getTileForToken(token);
verifyCaller(customTile);
if (customTile != null) {
verifyCaller(customTile);
customTile.startUnlockAndRun();
}
}