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

Merge "Adopt shell permission only to set and unset time limit." into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2019-04-22 19:20:10 +00:00
committed by Android (Google) Code Review
parent 2ff40b0cfb b647866cd0
commit 4c8d7a0401
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+18 -7
View File
@@ -31,14 +31,14 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
mTargetContext.getSystemService(UsageStatsManager.class); mTargetContext.getSystemService(UsageStatsManager.class);
final int observerId = 0; final int observerId = 0;
getInstrumentation().getUiAutomation().adoptShellPermissionIdentity();
try { try {
final String[] packages = new String[]{CALCULATOR_PACKAGE}; final String[] packages = new String[]{CALCULATOR_PACKAGE};
// Set time limit for app. // Set time limit for app.
usageStatsManager.registerAppUsageLimitObserver(observerId, packages, runWithShellPermission(() ->
Duration.ofSeconds(600), Duration.ofSeconds(300), usageStatsManager.registerAppUsageLimitObserver(observerId, packages,
PendingIntent.getActivity(mTargetContext, -1, new Intent(), 0)); Duration.ofSeconds(600), Duration.ofSeconds(300),
PendingIntent.getActivity(mTargetContext, -1, new Intent(), 0)));
mLauncher.pressHome(); mLauncher.pressHome();
final DigitalWellBeingToast toast = getToast(); final DigitalWellBeingToast toast = getToast();
@@ -47,13 +47,14 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
assertEquals("Toast text: ", "5 minutes left today", toast.getTextView().getText()); assertEquals("Toast text: ", "5 minutes left today", toast.getTextView().getText());
// Unset time limit for app. // Unset time limit for app.
usageStatsManager.unregisterAppUsageLimitObserver(observerId); runWithShellPermission(
() -> usageStatsManager.unregisterAppUsageLimitObserver(observerId));
mLauncher.pressHome(); mLauncher.pressHome();
assertFalse("Toast is visible", getToast().isShown()); assertFalse("Toast is visible", getToast().isShown());
} finally { } finally {
usageStatsManager.unregisterAppUsageLimitObserver(observerId); runWithShellPermission(
getInstrumentation().getUiAutomation().dropShellPermissionIdentity(); () -> usageStatsManager.unregisterAppUsageLimitObserver(observerId));
} }
} }
@@ -73,4 +74,14 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
private TaskView getLatestTask(Launcher launcher) { private TaskView getLatestTask(Launcher launcher) {
return launcher.<RecentsView>getOverviewPanel().getTaskViewAt(0); return launcher.<RecentsView>getOverviewPanel().getTaskViewAt(0);
} }
private void runWithShellPermission(Runnable action) {
getInstrumentation().getUiAutomation().adoptShellPermissionIdentity();
try {
action.run();
} finally {
getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
}
}
} }