drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"QS API: Fix mService and mTile being null once and for all\\" into nyc-dev am: fc70b07385

Browse Source 
am: c552a36992

Change-Id: I7a0cc08bbad4ae7ccfd3344f3235ab88eddefab4
This commit is contained in:
Jason Monk
2016-06-17 18:50:05 +00:00
committed by android-build-merger
parent a2affcbd8a c552a36992
commit 6a06372bb9
10 changed files with 49 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/quicksettings/IQSTileService.aidl
View File

@ -15,15 +15,10 @@
*/
package android.service.quicksettings;
import android.service.quicksettings.Tile;
import android.service.quicksettings.IQSService;
/**
* @hide
*/
oneway interface IQSTileService {
void setQSService(in IQSService service);
void setQSTile(in Tile tile);
void onTileAdded();
void onTileRemoved();
void onStartListening();

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

@ -115,6 +115,16 @@ public class TileService extends Service {
public static final String ACTION_REQUEST_LISTENING
= "android.service.quicksettings.action.REQUEST_LISTENING";
/**
* @hide
*/
public static final String EXTRA_SERVICE = "service";
/**
* @hide
*/
public static final String EXTRA_TILE = "tile";
/**
* @hide
*/
@ -305,17 +315,10 @@ 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);
return new IQSTileService.Stub() {
@Override
public void setQSService(IQSService service) throws RemoteException {
mHandler.obtainMessage(H.MSG_SET_SERVICE, service).sendToTarget();
}
@Override
public void setQSTile(Tile tile) throws RemoteException {
mHandler.obtainMessage(H.MSG_SET_TILE, tile).sendToTarget();
}
@Override
public void onTileRemoved() throws RemoteException {
mHandler.sendEmptyMessage(H.MSG_TILE_REMOVED);
@ -349,14 +352,12 @@ public class TileService extends Service {
}
private class H extends Handler {
private static final int MSG_SET_TILE = 1;
private static final int MSG_START_LISTENING = 2;
private static final int MSG_STOP_LISTENING = 3;
private static final int MSG_TILE_ADDED = 4;
private static final int MSG_TILE_REMOVED = 5;
private static final int MSG_TILE_CLICKED = 6;
private static final int MSG_SET_SERVICE = 7;
private static final int MSG_UNLOCK_COMPLETE = 8;
private static final int MSG_START_LISTENING = 1;
private static final int MSG_STOP_LISTENING = 2;
private static final int MSG_TILE_ADDED = 3;
private static final int MSG_TILE_REMOVED = 4;
private static final int MSG_TILE_CLICKED = 5;
private static final int MSG_UNLOCK_COMPLETE = 6;
public H(Looper looper) {
super(looper);
@ -365,18 +366,6 @@ public class TileService extends Service {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_SET_SERVICE:
mService = (IQSService) msg.obj;
if (mTile != null) {
mTile.setService(mService);
}
break;
case MSG_SET_TILE:
mTile = (Tile) msg.obj;
if (mService != null && mTile != null) {
mTile.setService(mService);
}
break;
case MSG_TILE_ADDED:
TileService.this.onTileAdded();
break;

9
packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java vendored
View File

@ -71,17 +71,12 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen
super(host);
mWindowManager = WindowManagerGlobal.getWindowManagerService();
mComponent = ComponentName.unflattenFromString(action);
mTile = new Tile(mComponent);
setTileIcon();
mServiceManager = host.getTileServices().getTileWrapper(this);
mService = mServiceManager.getTileService();
mServiceManager.setTileChangeListener(this);
mTile = new Tile(mComponent);
mUser = ActivityManager.getCurrentUser();
setTileIcon();
try {
mService.setQSTile(mTile);
} catch (RemoteException e) {
// Called through wrapper, won't happen here.
}
}
private void setTileIcon() {

20
packages/SystemUI/src/com/android/systemui/qs/external/QSTileServiceWrapper.java vendored
View File

@ -35,16 +35,6 @@ public class QSTileServiceWrapper {
return mService.asBinder();
}
public boolean setQSTile(Tile tile) {
try {
mService.setQSTile(tile);
return true;
} catch (Exception e) {
Log.d(TAG, "Caught exception from TileService", e);
return false;
}
}
public boolean onTileAdded() {
try {
mService.onTileAdded();
@ -95,16 +85,6 @@ public class QSTileServiceWrapper {
}
}
public boolean setQSService(IQSService service) {
try {
mService.setQSService(service);
return true;
} catch (Exception e) {
Log.d(TAG, "Caught exception from TileService", e);
return false;
}
}
public boolean onUnlockComplete() {
try {
mService.onUnlockComplete();

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

@ -71,23 +71,24 @@ public class TileLifecycleManager extends BroadcastReceiver implements
private Set<Integer> mQueuedMessages = new ArraySet<>();
private QSTileServiceWrapper mWrapper;
private boolean mListening;
private Tile mTile;
private IBinder mClickBinder;
private int mBindTryCount;
private boolean mBound;
@VisibleForTesting
boolean mReceiverRegistered;
private IQSService mService;
private boolean mUnbindImmediate;
private TileChangeListener mChangeListener;
// Return value from bindServiceAsUser, determines whether safe to call unbind.
private boolean mIsBound;
public TileLifecycleManager(Handler handler, Context context, Intent intent, UserHandle user) {
public TileLifecycleManager(Handler handler, Context context, IQSService service,
Tile tile, Intent intent, UserHandle user) {
mContext = context;
mHandler = handler;
mIntent = intent;
mIntent.putExtra(TileService.EXTRA_SERVICE, service.asBinder());
mIntent.putExtra(TileService.EXTRA_TILE, tile);
mUser = user;
if (DEBUG) Log.d(TAG, "Creating " + mIntent + " " + mUser);
}
@ -164,14 +165,6 @@ public class TileLifecycleManager extends BroadcastReceiver implements
service.linkToDeath(this, 0);
} catch (RemoteException e) {
}
if (!wrapper.setQSService(mService)) {
handleDeath();
return;
}
if (!wrapper.setQSTile(mTile)) {
handleDeath();
return;
}
mWrapper = wrapper;
handlePendingMessages();
}
@ -255,15 +248,6 @@ public class TileLifecycleManager extends BroadcastReceiver implements
}
}
@Override
public void setQSTile(Tile tile) {
if (DEBUG) Log.d(TAG, "setQSTile " + tile);
mTile = tile;
if (mWrapper != null && !mWrapper.setQSTile(tile)) {
handleDeath();
}
}
private boolean checkComponentState() {
PackageManager pm = mContext.getPackageManager();
if (!isPackageAvailable(pm) || !isComponentAvailable(pm)) {
@ -346,14 +330,6 @@ public class TileLifecycleManager extends BroadcastReceiver implements
}
}
@Override
public void setQSService(IQSService service) {
mService = service;
if (mWrapper == null || !mWrapper.setQSService(service)) {
handleDeath();
}
}
@Override
public void onTileAdded() {
if (DEBUG) Log.d(TAG, "onTileAdded");

7
packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java vendored
View File

@ -27,6 +27,7 @@ import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
import android.service.quicksettings.IQSTileService;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
@ -68,9 +69,10 @@ public class TileServiceManager {
// This defaults to true to ensure tiles start out unavailable.
private boolean mPendingBind = true;
TileServiceManager(TileServices tileServices, Handler handler, ComponentName component) {
TileServiceManager(TileServices tileServices, Handler handler, ComponentName component,
Tile tile) {
this(tileServices, handler, new TileLifecycleManager(handler,
tileServices.getContext(), new Intent().setComponent(component),
tileServices.getContext(), tileServices, tile, new Intent().setComponent(component),
new UserHandle(ActivityManager.getCurrentUser())));
}
@ -80,7 +82,6 @@ public class TileServiceManager {
mServices = tileServices;
mHandler = handler;
mStateManager = tileLifecycleManager;
mStateManager.setQSService(tileServices);
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

6
packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java vendored
View File

@ -78,7 +78,7 @@ public class TileServices extends IQSService.Stub {
public TileServiceManager getTileWrapper(CustomTile tile) {
ComponentName component = tile.getComponent();
TileServiceManager service = onCreateTileService(component);
TileServiceManager service = onCreateTileService(component, tile.getQsTile());
synchronized (mServices) {
mServices.put(tile, service);
mTiles.put(component, tile);
@ -86,8 +86,8 @@ public class TileServices extends IQSService.Stub {
return service;
}
protected TileServiceManager onCreateTileService(ComponentName component) {
return new TileServiceManager(this, mHandler, component);
protected TileServiceManager onCreateTileService(ComponentName component, Tile tile) {
return new TileServiceManager(this, mHandler, component, tile);
}
public void freeService(CustomTile tile, TileServiceManager service) {

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
View File

@ -30,6 +30,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.provider.Settings.Secure;
import android.service.quicksettings.Tile;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@ -403,10 +404,11 @@ public class QSTileHost implements QSTile.Host, Tunable {
String tileSpec = previousTiles.get(i);
if (!tileSpec.startsWith(CustomTile.PREFIX)) continue;
if (!newTiles.contains(tileSpec)) {
Intent intent = new Intent().setComponent(
CustomTile.getComponentFromSpec(tileSpec));
ComponentName component = CustomTile.getComponentFromSpec(tileSpec);
Intent intent = new Intent().setComponent(component);
TileLifecycleManager lifecycleManager = new TileLifecycleManager(new Handler(),
mContext, intent, new UserHandle(ActivityManager.getCurrentUser()));
mContext, mServices, new Tile(component), intent,
new UserHandle(ActivityManager.getCurrentUser()));
lifecycleManager.onStopListening();
lifecycleManager.onTileRemoved();
lifecycleManager.flushMessagesAndUnbind();
@ -416,10 +418,11 @@ public class QSTileHost implements QSTile.Host, Tunable {
String tileSpec = newTiles.get(i);
if (!tileSpec.startsWith(CustomTile.PREFIX)) continue;
if (!previousTiles.contains(tileSpec)) {
Intent intent = new Intent().setComponent(
CustomTile.getComponentFromSpec(tileSpec));
ComponentName component = CustomTile.getComponentFromSpec(tileSpec);
Intent intent = new Intent().setComponent(component);
TileLifecycleManager lifecycleManager = new TileLifecycleManager(new Handler(),
mContext, intent, new UserHandle(ActivityManager.getCurrentUser()));
mContext, mServices, new Tile(component), intent,
new UserHandle(ActivityManager.getCurrentUser()));
lifecycleManager.onTileAdded();
lifecycleManager.flushMessagesAndUnbind();
}

17
packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTests.java vendored
View File

@ -36,6 +36,8 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.util.ArraySet;
import android.util.Log;
import org.mockito.Mockito;
@SmallTest
public class TileLifecycleManagerTests extends AndroidTestCase {
public static final String TILE_UPDATE_BROADCAST = "com.android.systemui.tests.TILE_UPDATE";
@ -54,8 +56,11 @@ public class TileLifecycleManagerTests extends AndroidTestCase {
mThread = new HandlerThread("TestThread");
mThread.start();
mHandler = new Handler(mThread.getLooper());
ComponentName component = new ComponentName(mContext, FakeTileService.class);
mStateManager = new TileLifecycleManager(mHandler, getContext(),
new Intent(mContext, FakeTileService.class), new UserHandle(UserHandle.myUserId()));
Mockito.mock(IQSService.class), new Tile(component),
new Intent().setComponent(component),
new UserHandle(UserHandle.myUserId()));
mCallbacks.clear();
getContext().registerReceiver(mReceiver, new IntentFilter(TILE_UPDATE_BROADCAST));
}
@ -251,16 +256,6 @@ public class TileLifecycleManagerTests extends AndroidTestCase {
@Override
public IBinder onBind(Intent intent) {
return new IQSTileService.Stub() {
@Override
public void setQSService(IQSService service) {
}
@Override
public void setQSTile(Tile tile) throws RemoteException {
}
@Override
public void onTileAdded() throws RemoteException {
sendCallback("onTileAdded");

3
packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServicesTests.java vendored
View File

@ -17,6 +17,7 @@ package com.android.systemui.qs.external;
import android.content.ComponentName;
import android.os.Looper;
import android.service.quicksettings.Tile;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.phone.QSTileHost;
@ -109,7 +110,7 @@ public class TileServicesTests extends SysuiTestCase {
}
@Override
protected TileServiceManager onCreateTileService(ComponentName component) {
protected TileServiceManager onCreateTileService(ComponentName component, Tile qsTile) {
TileServiceManager manager = Mockito.mock(TileServiceManager.class);
mManagers.add(manager);
return manager;