Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cee4f5ed authored by Winson Chung's avatar Winson Chung
Browse files

Skip restoring one handed settings if not supported on device 

Bug: 172581971
Test: atest WMShellUnitTests
Change-Id: I4814c2609a39c523e199eb56f8060a9dc0bbc58b
parent 3b9c996e

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedTestCase.java

+7 −5
Original line number Diff line number Diff line
@@ -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(),