PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e am: e686a77ec9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945

Change-Id: Ia3ead3945813be4aca3e91e83f853fa35138c800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vania Januar
2023-05-03 10:13:59 +00:00
committed by Automerger Merge Worker
parent 53b73796f2 e686a77ec9
commit 6857cb3213
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.content.Context;
import android.content.Intent;
@@ -108,6 +109,15 @@ public class StylusDeviceUpdaterTest {
any());
}
@Test
public void onInputDeviceAdded_null_doesNothing() {
doReturn(null).when(mInputManager).getInputDevice(0);
mStylusDeviceUpdater.onInputDeviceAdded(0);
verify(mInputManager).getInputDevice(0);
verifyNoMoreInteractions(mInputManager);
}
@Test
public void onInputDeviceAdded_internalStylus_registersBatteryListener() {
mStylusDeviceUpdater.onInputDeviceAdded(1);
@@ -124,6 +134,15 @@ public class StylusDeviceUpdaterTest {
any());
}
@Test
public void onInputDeviceChanged_null_doesNothing() {
doReturn(null).when(mInputManager).getInputDevice(0);
mStylusDeviceUpdater.onInputDeviceChanged(0);
verify(mInputManager).getInputDevice(0);
verifyNoMoreInteractions(mInputManager);
}
@Test
public void click_usiPreference_launchUsiDetailsPage() {
doReturn(mSettingsActivity).when(mDashboardFragment).getContext();