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

Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-25 17:11:14 +00:00
committed by Android (Google) Code Review
parent 8fd8a4fde8 6d21e0d8d2
commit 7e10e630b4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,8 @@ public class TileLifecycleManager extends BroadcastReceiver implements
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) {
mContext = context;
@@ -132,7 +134,7 @@ public class TileLifecycleManager extends BroadcastReceiver implements
}
if (DEBUG) Log.d(TAG, "Binding service " + mIntent + " " + mUser);
mBindTryCount++;
mContext.bindServiceAsUser(mIntent, this,
mIsBound = mContext.bindServiceAsUser(mIntent, this,
Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,
mUser);
} else {
@@ -140,7 +142,10 @@ public class TileLifecycleManager extends BroadcastReceiver implements
// Give it another chance next time it needs to be bound, out of kindness.
mBindTryCount = 0;
mWrapper = null;
mContext.unbindService(this);
if (mIsBound) {
mContext.unbindService(this);
mIsBound = false;
}
}
}