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

Merge "Add guards around unbind" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-15 21:39:20 +00:00
committed by Android (Google) Code Review
parent 31d54d9a3b 95a0a7ffa4
commit e2b3bf94c5
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import java.util.NoSuchElementException;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -204,9 +205,14 @@ public class TileLifecycleManager extends BroadcastReceiver implements
if (DEBUG) Log.d(TAG, "Unbinding service " + mIntent + " " + mUser); if (DEBUG) Log.d(TAG, "Unbinding service " + mIntent + " " + mUser);
// Give it another chance next time it needs to be bound, out of kindness. // Give it another chance next time it needs to be bound, out of kindness.
mBindTryCount = 0; mBindTryCount = 0;
mWrapper = null; freeWrapper();
if (mIsBound) { if (mIsBound) {
mContext.unbindService(this); try {
mContext.unbindService(this);
} catch (Exception e) {
Log.e(TAG, "Failed to unbind service "
+ mIntent.getComponent().flattenToShortString(), e);
}
mIsBound = false; mIsBound = false;
} }
} }
@@ -290,7 +296,9 @@ public class TileLifecycleManager extends BroadcastReceiver implements
private void handleDeath() { private void handleDeath() {
if (mWrapper == null) return; if (mWrapper == null) return;
mWrapper = null; freeWrapper();
// Clearly not bound anymore
mIsBound = false;
if (!mBound) return; if (!mBound) return;
if (DEBUG) Log.d(TAG, "handleDeath"); if (DEBUG) Log.d(TAG, "handleDeath");
if (checkComponentState()) { if (checkComponentState()) {
@@ -472,6 +480,18 @@ public class TileLifecycleManager extends BroadcastReceiver implements
return mToken; return mToken;
} }
private void freeWrapper() {
if (mWrapper != null) {
try {
mWrapper.asBinder().unlinkToDeath(this, 0);
} catch (NoSuchElementException e) {
Log.w(TAG, "Trying to unlink not linked recipient for component"
+ mIntent.getComponent().flattenToShortString());
}
mWrapper = null;
}
}
public interface TileChangeListener { public interface TileChangeListener {
void onTileChanged(ComponentName tile); void onTileChanged(ComponentName tile);
} }

2
packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTest.java vendored
View File

@@ -77,10 +77,10 @@ public class TileLifecycleManagerTest extends SysuiTestCase {
// Stub.asInterface will just return itself. // Stub.asInterface will just return itself.
when(mMockTileService.queryLocalInterface(anyString())).thenReturn(mMockTileService); when(mMockTileService.queryLocalInterface(anyString())).thenReturn(mMockTileService);
when(mMockTileService.asBinder()).thenReturn(mMockTileService);
mContext.addMockService(mTileServiceComponentName, mMockTileService); mContext.addMockService(mTileServiceComponentName, mMockTileService);
mTileServiceIntent = new Intent().setComponent(mTileServiceComponentName); mTileServiceIntent = new Intent().setComponent(mTileServiceComponentName);
mUser = new UserHandle(UserHandle.myUserId()); mUser = new UserHandle(UserHandle.myUserId());
mThread = new HandlerThread("TestThread"); mThread = new HandlerThread("TestThread");