Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 955de278 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 1427bb3d

Change-Id: I9b5e57c302b6ae0f6accccf65b5e404a1ad780c0
parents d69553b5 1427bb3d

core/java/android/service/quicksettings/TileService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

    }