Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't load app restriction from saved files in test" into tm-dev

Browse Source
This commit is contained in:
Jing Ji
2022-04-02 04:40:17 +00:00
committed by Android (Google) Code Review
parent bf8817d3f0 d469d2c83e
commit a496007df5
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/AppRestrictionController.java
View File

@@ -1439,6 +1439,7 @@ public final class AppRestrictionController {
refreshAppRestrictionLevelForUser(userId, REASON_MAIN_FORCED_BY_USER, refreshAppRestrictionLevelForUser(userId, REASON_MAIN_FORCED_BY_USER,
REASON_SUB_FORCED_USER_FLAG_INTERACTION); REASON_SUB_FORCED_USER_FLAG_INTERACTION);
} }
if (!mInjector.isTest()) {
// Load the previously saved levels and update the current levels if needed. // Load the previously saved levels and update the current levels if needed.
mRestrictionSettings.scheduleLoadFromXml(); mRestrictionSettings.scheduleLoadFromXml();
// Also save the current levels right away. // Also save the current levels right away.
@@ -1446,6 +1447,7 @@ public final class AppRestrictionController {
mRestrictionSettings.schedulePersistToXml(userId); mRestrictionSettings.schedulePersistToXml(userId);
} }
} }
}
private void initSystemModuleNames() { private void initSystemModuleNames() {
final PackageManager pm = mInjector.getPackageManager(); final PackageManager pm = mInjector.getPackageManager();
@@ -2995,6 +2997,10 @@ public final class AppRestrictionController {
@CurrentTimeMillisLong long currentTimeMillis() { @CurrentTimeMillisLong long currentTimeMillis() {
return System.currentTimeMillis(); return System.currentTimeMillis();
} }
boolean isTest() {
return false;
}
} }
private void registerForSystemBroadcasts() { private void registerForSystemBroadcasts() {

5
services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java
View File

@@ -3056,6 +3056,11 @@ public final class BackgroundRestrictionTest {
long currentTimeMillis() { long currentTimeMillis() {
return mCurrentTimeMillis; return mCurrentTimeMillis;
} }
@Override
boolean isTest() {
return true;
}
} }
private class TestBaseTrackerInjector<T extends BaseAppStatePolicy> private class TestBaseTrackerInjector<T extends BaseAppStatePolicy>