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

am: 955de27827

Change-Id: I54da9edd0593160ee38002cb2d97c64248a9ed96
This commit is contained in:
Jason Monk
2016-06-23 21:07:50 +00:00
committed by android-build-merger
2 changed files with 3 additions and 1 deletions

View File

@@ -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);
}

View File

@@ -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);
}