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

Merge "[Performance] avoid setting the same optimization mode again" into sc-v2-dev am: f3155c03f0 am: f5fe795a34

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

Change-Id: I982c82723e8ec3d79b149f09a6d8ddc0f7d21447
This commit is contained in:
TreeHugger Robot
2021-08-30 11:13:00 +00:00
committed by Automerger Merge Worker
parent 283dde2a7a f5fe795a34
commit 0166f321c2
2 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
View File

@@ -36,13 +36,12 @@ public class BatteryOptimizeUtils {
@VisibleForTesting AppOpsManager mAppOpsManager; @VisibleForTesting AppOpsManager mAppOpsManager;
@VisibleForTesting BatteryUtils mBatteryUtils; @VisibleForTesting BatteryUtils mBatteryUtils;
@VisibleForTesting PowerAllowlistBackend mPowerAllowListBackend; @VisibleForTesting PowerAllowlistBackend mPowerAllowListBackend;
@VisibleForTesting int mMode;
@VisibleForTesting boolean mAllowListed;
private final String mPackageName; private final String mPackageName;
private final int mUid; private final int mUid;
private int mMode;
private boolean mAllowListed;
// Optimization modes. // Optimization modes.
static final int MODE_UNKNOWN = 0; static final int MODE_UNKNOWN = 0;
static final int MODE_RESTRICTED = 1; static final int MODE_RESTRICTED = 1;
@@ -92,6 +91,10 @@ public class BatteryOptimizeUtils {
/** Sets the {@link OptimizationMode} for associated app. */ /** Sets the {@link OptimizationMode} for associated app. */
public void setAppOptimizationMode(@OptimizationMode int mode) { public void setAppOptimizationMode(@OptimizationMode int mode) {
if (getAppOptimizationMode(mMode, mAllowListed) == mode) {
Log.w(TAG, "set the same optimization mode for: " + mPackageName);
return;
}
switch (mode) { switch (mode) {
case MODE_RESTRICTED: case MODE_RESTRICTED:
mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_IGNORED); mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_IGNORED);

60
tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.AppOpsManager; import android.app.AppOpsManager;
@@ -47,9 +48,9 @@ public class BatteryOptimizeUtilsTest {
private static final int UID = 12345; private static final int UID = 12345;
private static final String PACKAGE_NAME = "com.android.app"; private static final String PACKAGE_NAME = "com.android.app";
@Mock BatteryUtils mockBatteryUtils; @Mock BatteryUtils mMockBatteryUtils;
@Mock AppOpsManager mockAppOpsManager; @Mock AppOpsManager mMockAppOpsManager;
@Mock PowerAllowlistBackend mockBackend; @Mock PowerAllowlistBackend mMockBackend;
private Context mContext; private Context mContext;
private BatteryOptimizeUtils mBatteryOptimizeUtils; private BatteryOptimizeUtils mBatteryOptimizeUtils;
@@ -59,15 +60,18 @@ public class BatteryOptimizeUtilsTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME)); mBatteryOptimizeUtils = spy(new BatteryOptimizeUtils(mContext, UID, PACKAGE_NAME));
mBatteryOptimizeUtils.mAppOpsManager = mockAppOpsManager; mBatteryOptimizeUtils.mAppOpsManager = mMockAppOpsManager;
mBatteryOptimizeUtils.mBatteryUtils = mockBatteryUtils; mBatteryOptimizeUtils.mBatteryUtils = mMockBatteryUtils;
mBatteryOptimizeUtils.mPowerAllowListBackend = mockBackend; mBatteryOptimizeUtils.mPowerAllowListBackend = mMockBackend;
// Sets the default mode as MODE_RESTRICTED.
mBatteryOptimizeUtils.mMode = AppOpsManager.MODE_IGNORED;
mBatteryOptimizeUtils.mAllowListed = false;
} }
@Test @Test
public void testGetAppOptimizationMode_returnRestricted() { public void testGetAppOptimizationMode_returnRestricted() {
when(mockBackend.isAllowlisted(anyString())).thenReturn(false); when(mMockBackend.isAllowlisted(anyString())).thenReturn(false);
when(mockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString())) when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_IGNORED); .thenReturn(AppOpsManager.MODE_IGNORED);
assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()) assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
@@ -76,8 +80,8 @@ public class BatteryOptimizeUtilsTest {
@Test @Test
public void testGetAppOptimizationMode_returnUnrestricted() { public void testGetAppOptimizationMode_returnUnrestricted() {
when(mockBackend.isAllowlisted(anyString())).thenReturn(true); when(mMockBackend.isAllowlisted(anyString())).thenReturn(true);
when(mockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString())) when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_ALLOWED); .thenReturn(AppOpsManager.MODE_ALLOWED);
assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()) assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
@@ -86,8 +90,8 @@ public class BatteryOptimizeUtilsTest {
@Test @Test
public void testGetAppOptimizationMode_returnOptimized() { public void testGetAppOptimizationMode_returnOptimized() {
when(mockBackend.isAllowlisted(anyString())).thenReturn(false); when(mMockBackend.isAllowlisted(anyString())).thenReturn(false);
when(mockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString())) when(mMockAppOpsManager.checkOpNoThrow(anyInt(), anyInt(), anyString()))
.thenReturn(AppOpsManager.MODE_ALLOWED); .thenReturn(AppOpsManager.MODE_ALLOWED);
assertThat(mBatteryOptimizeUtils.getAppOptimizationMode()) assertThat(mBatteryOptimizeUtils.getAppOptimizationMode())
@@ -96,8 +100,8 @@ public class BatteryOptimizeUtilsTest {
@Test @Test
public void testIsSystemOrDefaultApp_isSystemOrDefaultApp_returnTrue() { public void testIsSystemOrDefaultApp_isSystemOrDefaultApp_returnTrue() {
when(mockBackend.isAllowlisted(anyString())).thenReturn(true); when(mMockBackend.isAllowlisted(anyString())).thenReturn(true);
when(mockBackend.isDefaultActiveApp(anyString())).thenReturn(true); when(mMockBackend.isDefaultActiveApp(anyString())).thenReturn(true);
assertThat(mBatteryOptimizeUtils.isSystemOrDefaultApp()).isTrue(); assertThat(mBatteryOptimizeUtils.isSystemOrDefaultApp()).isTrue();
} }
@@ -122,28 +126,44 @@ public class BatteryOptimizeUtilsTest {
@Test @Test
public void testSetAppOptimizationMode_Restricted_verifyAction() { public void testSetAppOptimizationMode_Restricted_verifyAction() {
// Sets the current mode as MODE_UNRESTRICTED.
mBatteryOptimizeUtils.mAllowListed = false;
mBatteryOptimizeUtils.mMode = AppOpsManager.MODE_ALLOWED;
mBatteryOptimizeUtils.setAppOptimizationMode(MODE_RESTRICTED); mBatteryOptimizeUtils.setAppOptimizationMode(MODE_RESTRICTED);
verify(mockBatteryUtils).setForceAppStandby(UID, verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_IGNORED); PACKAGE_NAME, AppOpsManager.MODE_IGNORED);
verify(mockBackend).removeApp(PACKAGE_NAME); verify(mMockBackend).removeApp(PACKAGE_NAME);
} }
@Test @Test
public void testSetAppOptimizationMode_Unrestricted_verifyAction() { public void testSetAppOptimizationMode_Unrestricted_verifyAction() {
mBatteryOptimizeUtils.setAppOptimizationMode(MODE_UNRESTRICTED); mBatteryOptimizeUtils.setAppOptimizationMode(MODE_UNRESTRICTED);
verify(mockBatteryUtils).setForceAppStandby(UID, verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_ALLOWED); PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
verify(mockBackend).addApp(PACKAGE_NAME); verify(mMockBackend).addApp(PACKAGE_NAME);
} }
@Test @Test
public void testSetAppOptimizationMode_Optimized_verifyAction() { public void testSetAppOptimizationMode_Optimized_verifyAction() {
mBatteryOptimizeUtils.setAppOptimizationMode(MODE_OPTIMIZED); mBatteryOptimizeUtils.setAppOptimizationMode(MODE_OPTIMIZED);
verify(mockBatteryUtils).setForceAppStandby(UID, verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_ALLOWED); PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
verify(mockBackend).removeApp(PACKAGE_NAME); verify(mMockBackend).removeApp(PACKAGE_NAME);
}
@Test
public void testSetAppOptimizationMode_sameUnrestrictedMode_verifyNoAction() {
// Sets the current mode as MODE_UNRESTRICTED.
mBatteryOptimizeUtils.mAllowListed = true;
mBatteryOptimizeUtils.mMode = AppOpsManager.MODE_ALLOWED;
mBatteryOptimizeUtils.setAppOptimizationMode(MODE_UNRESTRICTED);
verifyZeroInteractions(mMockBackend);
verifyZeroInteractions(mMockBatteryUtils);
} }
} }