Merge "More gracefully handle client death" (96c2184e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/slice/PinnedSliceState.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ public class PinnedSliceState {
		ContentProviderClient getClient() {
		ContentProviderClient client =
		mService.getContext().getContentResolver().acquireContentProviderClient(mUri);
		if (client == null) return null;
		client.setDetectNotResponding(SLICE_TIMEOUT);
		return client;
		}
		@@ -181,6 +182,7 @@ public class PinnedSliceState {
		}
		if (!isPinned()) {
		// All the listeners died, remove from pinned state.
		mService.unlisten(mUri);
		mService.removePinnedSlice(mUri);
		}
		}
		@@ -210,6 +212,7 @@ public class PinnedSliceState {
		}
		if (!isPinned()) {
		// All the listeners died, remove from pinned state.
		mService.unlisten(mUri);
		mService.removePinnedSlice(mUri);
		}
		}
		@@ -217,6 +220,7 @@ public class PinnedSliceState {

		private Slice doBind(String overridePkg) {
		try (ContentProviderClient client = getClient()) {
		if (client == null) return null;
		Bundle extras = new Bundle();
		extras.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri);
		extras.putParcelableArrayList(SliceProvider.EXTRA_SUPPORTED_SPECS,
		@@ -237,6 +241,7 @@ public class PinnedSliceState {

		private void handleSendPinned() {
		try (ContentProviderClient client = getClient()) {
		if (client == null) return;
		Bundle b = new Bundle();
		b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri);
		try {
		@@ -249,6 +254,7 @@ public class PinnedSliceState {

		private void handleSendUnpinned() {
		try (ContentProviderClient client = getClient()) {
		if (client == null) return;
		Bundle b = new Bundle();
		b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri);
		try {

services/tests/uiservicestests/src/com/android/server/slice/PinnedSliceStateTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ public class PinnedSliceStateTest extends UiServiceTestCase {
		when(binder.isBinderAlive()).thenReturn(false);
		arg.getValue().binderDied();

		verify(mSliceService).unlisten(eq(TEST_URI));
		verify(mSliceService).removePinnedSlice(eq(TEST_URI));
		assertFalse(mPinnedSliceManager.isPinned());
		}