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

Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev

Browse Source 
am: 126088536d

Change-Id: Ie187a5c2e062f9b51fd21e80e81cac15f02ccbe6
This commit is contained in:
Jason Monk
2016-06-22 16:53:58 +00:00
committed by android-build-merger
parent 0621ef49f4 126088536d
commit d8aa42f3e2
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/service/quicksettings/IQSService.aidl
View File

@@ -23,6 +23,7 @@ import android.service.quicksettings.Tile;
* @hide
*/
interface IQSService {
Tile getTile(in ComponentName component);
void updateQsTile(in Tile tile);
void updateStatusIcon(in Tile tile, in Icon icon,
String contentDescription);

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

@@ -120,11 +120,6 @@ public class TileService extends Service {
*/
public static final String EXTRA_SERVICE = "service";
/**
* @hide
*/
public static final String EXTRA_TILE = "tile";
/**
* @hide
*/
@@ -315,9 +310,16 @@ public class TileService extends Service {
@Override
public IBinder onBind(Intent intent) {
mTile = intent.getParcelableExtra(EXTRA_TILE);
mService = IQSService.Stub.asInterface(intent.getIBinderExtra(EXTRA_SERVICE));
mTile.setService(mService);
try {
mTile = mService.getTile(new ComponentName(getPackageName(), getClass().getName()));
} catch (RemoteException e) {
throw new RuntimeException("Unable to reach IQSService", e);
}
if (mTile != null) {
mTile.setService(mService);
mHandler.sendEmptyMessage(H.MSG_START_SUCCESS);
}
return new IQSTileService.Stub() {
@Override
public void onTileRemoved() throws RemoteException {
@@ -358,6 +360,7 @@ public class TileService extends Service {
private static final int MSG_TILE_REMOVED = 4;
private static final int MSG_TILE_CLICKED = 5;
private static final int MSG_UNLOCK_COMPLETE = 6;
private static final int MSG_START_SUCCESS = 7;
public H(Looper looper) {
super(looper);
@@ -397,6 +400,12 @@ public class TileService extends Service {
mUnlockRunnable.run();
}
break;
case MSG_START_SUCCESS:
try {
mService.onStartSuccessful(mTile);
} catch (RemoteException e) {
}
break;
}
}
}