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

Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-06-23 20:52:49 +00:00
committed by Android (Google) Code Review
parent b3ad74eb46 6edbefdd54
commit 1427bb3dc0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/quicksettings/TileService.java
View File

@@ -312,7 +312,8 @@ public class TileService extends Service {
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {
mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE)); mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE));
try { try {
mTile = mService.getTile(new ComponentName(getPackageName(), getClass().getName())); ComponentName component = intent.getParcelableExtra(EXTRA_COMPONENT);
mTile = mService.getTile(component);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new RuntimeException("Unable to reach IQSService", e); throw new RuntimeException("Unable to reach IQSService", e);
} }

1
packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java vendored
View File

@@ -88,6 +88,7 @@ public class TileLifecycleManager extends BroadcastReceiver implements
mHandler = handler; mHandler = handler;
mIntent = intent; mIntent = intent;
mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder()); mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder());
mIntent.putExtra(TileService.EXTRA_COMPONENT, intent.getComponent());
mUser = user; mUser = user;
if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser); if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser);
} }