diff options
| author | 2016-06-23 21:02:13 +0000 | |
|---|---|---|
| committer | 2016-06-23 21:02:13 +0000 | |
| commit | 9981d94d54cc0242e0f7f211ce07ca1320ab09d0 (patch) | |
| tree | 75b269ee4a60ccb7cc1b20de2d9f312b1818f9e4 | |
| parent | 4b6614e5762852e4495a991b5fc833a342f2cb36 (diff) | |
| parent | 1427bb3dc0b4a710ec17b5a065db3980bea70676 (diff) | |
Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0
Change-Id: I471055cbac21c09d23b60e6dab15bcc1cd1d6208
| -rw-r--r-- | core/java/android/service/quicksettings/TileService.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/service/quicksettings/TileService.java b/core/java/android/service/quicksettings/TileService.java index 55cfb49fe14e..50411ab7d15e 100644 --- a/core/java/android/service/quicksettings/TileService.java +++ b/core/java/android/service/quicksettings/TileService.java @@ -312,7 +312,8 @@ public class TileService extends Service { public IBinder onBind(Intent intent) { mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE)); try { - mTile = mService.getTile(new ComponentName(getPackageName(), getClass().getName())); + ComponentName component = intent.getParcelableExtra(EXTRA_COMPONENT); + mTile = mService.getTile(component); } catch (RemoteException e) { throw new RuntimeException("Unable to reach IQSService", e); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java index d68502ee956e..79f9de6b4bf7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java @@ -88,6 +88,7 @@ public class TileLifecycleManager extends BroadcastReceiver implements mHandler = handler; mIntent = intent; mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder()); + mIntent.putExtra(TileService.EXTRA_COMPONENT, intent.getComponent()); mUser = user; if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser); } |