Merge cherrypicks of ['googleplex-android-review.googlesource.com/29357274',... (5ce024f3) · Commits · e / os / android_frameworks_base

core/java/android/widget/RemoteViewsAdapter.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
		}
		}

		@Override
		public void onNullBinding(ComponentName name) {
		enqueueDeferredUnbindServiceMessage();
		}

		@Override
		public void handleMessage(Message msg) {
		RemoteViewsAdapter adapter = mAdapter.get();

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBO

		import static com.google.android.setupcompat.util.WizardManagerHelper.SETTINGS_SECURE_USER_SETUP_COMPLETE;

		import android.app.KeyguardManager;
		import android.content.ClipData;
		import android.content.ClipboardManager;
		import android.content.Context;
		@@ -59,18 +60,21 @@ public class ClipboardListener extends CoreStartable
		private final ClipboardOverlayControllerFactory mOverlayFactory;
		private final ClipboardToast mClipboardToast;
		private final ClipboardManager mClipboardManager;
		private final KeyguardManager mKeyguardManager;
		private final UiEventLogger mUiEventLogger;
		private ClipboardOverlayController mClipboardOverlayController;

		@Inject
		public ClipboardListener(Context context, DeviceConfigProxy deviceConfigProxy,
		ClipboardOverlayControllerFactory overlayFactory, ClipboardManager clipboardManager,
		ClipboardToast clipboardToast,UiEventLogger uiEventLogger) {
		ClipboardToast clipboardToast, KeyguardManager keyguardManager,
		UiEventLogger uiEventLogger) {
		super(context);
		mDeviceConfig = deviceConfigProxy;
		mOverlayFactory = overlayFactory;
		mClipboardToast = clipboardToast;
		mClipboardManager = clipboardManager;
		mKeyguardManager = keyguardManager;
		mUiEventLogger = uiEventLogger;
		}

		@@ -96,8 +100,11 @@ public class ClipboardListener extends CoreStartable
		return;
		}

		if (!isUserSetupComplete()) {
		// just show a toast, user should not access intents from this state
		// user should not access intents before setup or while device is locked
		if (mKeyguardManager.isDeviceLocked()
		\|\| !isUserSetupComplete()
		\|\| clipData == null // shouldn't happen, but just in case
		\|\| clipData.getItemCount() == 0) {
		if (shouldShowToast(clipData)) {
		mUiEventLogger.log(CLIPBOARD_TOAST_SHOWN, 0, clipSource);
		mClipboardToast.showCopiedToast();

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java

+44 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.verifyZeroInteractions;
		import static org.mockito.Mockito.when;

		import android.app.KeyguardManager;
		import android.content.ClipData;
		import android.content.ClipDescription;
		import android.content.ClipboardManager;
		@@ -60,6 +61,8 @@ public class ClipboardListenerTest extends SysuiTestCase {
		@Mock
		private ClipboardOverlayControllerFactory mClipboardOverlayControllerFactory;
		@Mock
		private KeyguardManager mKeyguardManager;
		@Mock
		private ClipboardOverlayController mOverlayController;
		@Mock
		private ClipboardToast mClipboardToast;
		@@ -97,7 +100,7 @@ public class ClipboardListenerTest extends SysuiTestCase {

		mClipboardListener = new ClipboardListener(getContext(), mDeviceConfigProxy,
		mClipboardOverlayControllerFactory, mClipboardManager,mClipboardToast,
		mUiEventLogger);
		mKeyguardManager, mUiEventLogger);
		}

		@Test
		@@ -201,4 +204,44 @@ public class ClipboardListenerTest extends SysuiTestCase {
		verify(mClipboardToast, times(1)).showCopiedToast();
		verifyZeroInteractions(mClipboardOverlayControllerFactory);
		}

		@Test
		public void test_deviceLocked_showsToast() {
		when(mKeyguardManager.isDeviceLocked()).thenReturn(true);

		mClipboardListener.start();
		mClipboardListener.onPrimaryClipChanged();

		verify(mUiEventLogger, times(1)).log(
		ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource);
		verify(mClipboardToast, times(1)).showCopiedToast();
		verifyZeroInteractions(mClipboardOverlayControllerFactory);
		}

		@Test
		public void test_nullClipData_showsNothing() {
		when(mClipboardManager.getPrimaryClip()).thenReturn(null);

		mClipboardListener.start();
		mClipboardListener.onPrimaryClipChanged();

		verifyZeroInteractions(mUiEventLogger);
		verifyZeroInteractions(mClipboardToast);
		verifyZeroInteractions(mClipboardOverlayControllerFactory);
		}

		@Test
		public void test_emptyClipData_showsToast() {
		ClipDescription description = new ClipDescription("Test", new String[0]);
		ClipData noItems = new ClipData(description, new ArrayList<>());
		when(mClipboardManager.getPrimaryClip()).thenReturn(noItems);

		mClipboardListener.start();
		mClipboardListener.onPrimaryClipChanged();

		verify(mUiEventLogger, times(1)).log(
		ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource);
		verify(mClipboardToast, times(1)).showCopiedToast();
		verifyZeroInteractions(mClipboardOverlayControllerFactory);
		}
		}

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1798,6 +1798,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		mContext.unbindService(this);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		mContext.unbindService(this);
		}

		@Override
		public void onServiceDisconnected(ComponentName name) {
		// Do nothing
		@@ -1938,6 +1943,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		mContext.unbindService(this);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		mContext.unbindService(this);
		}

		@Override
		public void onServiceDisconnected(android.content.ComponentName name) {
		// Do nothing