From cee4f5ed8e18a881a0c7c1db9d7c86be20b3bfaf Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 5 Nov 2020 11:03:06 -0800 Subject: [PATCH] Skip restoring one handed settings if not supported on device Bug: 172581971 Test: atest WMShellUnitTests Change-Id: I4814c2609a39c523e199eb56f8060a9dc0bbc58b --- .../wm/shell/onehanded/OneHandedTestCase.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java index c7ae2a09ad67f..73a95345e1c9b 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java @@ -46,6 +46,8 @@ public abstract class OneHandedTestCase { @Before public void setupSettings() { + assumeTrue(SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)); + final Context testContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); final DisplayManager dm = testContext.getSystemService(DisplayManager.class); @@ -74,13 +76,13 @@ public abstract class OneHandedTestCase { Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1); } - @Before - public void assumeOneHandedModeSupported() { - assumeTrue(SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)); - } - @After public void restoreSettings() { + if (mContext == null) { + // Return early if one-handed mode is not supported + return; + } + Settings.Secure.putInt(getContext().getContentResolver(), Settings.Secure.ONE_HANDED_MODE_ENABLED, sOrigEnabled ? 1 : 0); Settings.Secure.putInt(mContext.getContentResolver(),