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

Commit 0a7ad89f authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "fw/base: work around mockito upgrade issues" into main am: f33f4dbe 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3504417



Change-Id: I798e2c47231f03debbd1680364a85b8ed23d2a20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c5456d1 f33f4dbe

packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession 
import com.android.dx.mockito.inline.extended.ExtendedMockito.never

import com.android.dx.mockito.inline.extended.ExtendedMockito.times

import com.android.dx.mockito.inline.extended.ExtendedMockito.verify

import com.android.dx.mockito.inline.extended.MockedVoidMethod

import com.android.dx.mockito.inline.extended.StaticMockitoSession

import com.android.internal.logging.InstanceId

import com.android.internal.logging.UiEventLogger
@@ -246,7 +247,7 @@ class StylusManagerTest : SysuiTestCase() { 
    @Test

    fun onInputDeviceAdded_btStylus_firstUsed_setsFlag() {

        stylusManager.onInputDeviceAdded(BT_STYLUS_DEVICE_ID)

        verify({ InputSettings.setStylusEverUsed(mContext, true) }, times(1))

        verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, times(1))

    }



    @Test
@@ -512,7 +513,7 @@ class StylusManagerTest : SysuiTestCase() { 


        stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState)



        verify({ InputSettings.setStylusEverUsed(mContext, true) }, times(1))

        verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, times(1))

    }



    @Test
@@ -613,7 +614,7 @@ class StylusManagerTest : SysuiTestCase() { 


        stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState)



        verify({ InputSettings.setStylusEverUsed(mContext, true) }, never())

        verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, never())

    }



    @Test

services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java

+6 −6
Original line number Diff line number Diff line
@@ -396,6 +396,12 @@ public final class CachedAppOptimizerTest { 


        // When we override new reasonable throttle values after init...

        mCountDown = new CountDownLatch(8);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_MIN_OOM_ADJ,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_MAX_OOM_ADJ,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ - 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_1,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_1 + 1), false);
@@ -414,12 +420,6 @@ public final class CachedAppOptimizerTest { 
        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_6,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_MIN_OOM_ADJ,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1), false);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                CachedAppOptimizer.KEY_COMPACT_THROTTLE_MAX_OOM_ADJ,

                Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ - 1), false);

        assertThat(mCountDown.await(7, TimeUnit.SECONDS)).isTrue();



        // Then those flags values are reflected in the compactor.