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

Commit da86eed6 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Fixes for errorprone update" into main

parents 36280faa 0afaafeb

core/tests/coretests/src/android/app/ActivityManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public class ActivityManagerTest { 
    public void testProcState() throws Exception {

        // For the moment mostly want to confirm we don't crash

        assertNotNull(ActivityManager.procStateToString(PROCESS_STATE_SERVICE));

        assertNotNull(ActivityManager.processStateAmToProto(PROCESS_STATE_SERVICE));

        assertTrue(ActivityManager.isProcStateBackground(PROCESS_STATE_SERVICE));

        assertFalse(ActivityManager.isProcStateCached(PROCESS_STATE_SERVICE));

        assertFalse(ActivityManager.isForegroundService(PROCESS_STATE_SERVICE));

core/tests/coretests/src/android/app/activity/ActivityManagerTest.java

+0 −6
Original line number Diff line number Diff line
@@ -111,12 +111,6 @@ public class ActivityManagerTest extends AndroidTestCase { 
        assertEquals(config.reqKeyboardType, vconfig.keyboard);

        assertEquals(config.reqTouchScreen, vconfig.touchscreen);

        assertEquals(config.reqNavigation, vconfig.navigation);

        if (vconfig.navigation == Configuration.NAVIGATION_NONAV) {

            assertNotNull(config.reqInputFeatures & ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV);

        }

        if (vconfig.keyboard != Configuration.KEYBOARD_UNDEFINED) {

            assertNotNull(config.reqInputFeatures & ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD);

        }    

    }



    @SmallTest

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java

+0 −14
Original line number Diff line number Diff line
@@ -206,20 +206,6 @@ public class WifiUtilsTest { 
        WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_UNKNOWN);

    }



    @Test

    public void getHotspotIconResource_deviceTypeExists_shouldNotNull() {

        assertThat(WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_PHONE))

                .isNotNull();

        assertThat(WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_TABLET))

                .isNotNull();

        assertThat(WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_LAPTOP))

                .isNotNull();

        assertThat(WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_WATCH))

                .isNotNull();

        assertThat(WifiUtils.getHotspotIconResource(NetworkProviderInfo.DEVICE_TYPE_AUTO))

                .isNotNull();

    }



    @Test

    public void testInternetIconInjector_getIcon_returnsCorrectValues() {

        WifiUtils.InternetIconInjector iconInjector = new WifiUtils.InternetIconInjector(mContext);

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+2 −2
Original line number Diff line number Diff line
@@ -428,8 +428,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        ArgumentCaptor<FooterView> captor = ArgumentCaptor.forClass(FooterView.class);

        verify(mStackScroller).setFooterView(captor.capture());



        assertNotNull(captor.getValue().findViewById(R.id.manage_text).hasOnClickListeners());

        assertNotNull(captor.getValue().findViewById(R.id.dismiss_text).hasOnClickListeners());

        assertNotNull(captor.getValue().findViewById(R.id.manage_text));

        assertNotNull(captor.getValue().findViewById(R.id.dismiss_text));

    }



    @Test

services/tests/displayservicetests/src/com/android/server/display/PersistentDataStoreTest.java

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ public class PersistentDataStoreTest { 
        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());

        newInjector.setReadStream(bais);

        newDataStore.loadIfNeeded();

        assertNotNull(newDataStore.getUserPreferredRefreshRate(testDisplayDevice));

        assertEquals(85.3f, mDataStore.getUserPreferredRefreshRate(testDisplayDevice), 01.f);

        assertEquals(85.3f, newDataStore.getUserPreferredRefreshRate(testDisplayDevice), 0.1f);

    }