Force Garage Mode using ADB, then reboot the system
For bench testing, trigger Garage Mode using
'adb shell dumpsys car_service garage-mode reboot'.
When Garage Mode completes, reboot the system.
Garage Mode should not exit while app and system updates happening.
By rebooting the system, we guarantee that no updates happen after
Garage Mode exits. Thus, if all expected updates complete, we know
that Garage Mode did not terminate prematurely.
(This CL requires manual merge between Q and master.)
Bug: 148477933
Test: On the bench using ADB
Change-Id: I237a9481a848057113a26280576b98ca7917a798
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 40f863a..446589d 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -752,6 +752,7 @@
private static final String PARAM_ON_MODE = "on";
private static final String PARAM_OFF_MODE = "off";
private static final String PARAM_QUERY_MODE = "query";
+ private static final String PARAM_REBOOT = "reboot";
private static final int RESULT_OK = 0;
private static final int RESULT_ERROR = -1; // Arbitrary value, any non-0 is fine
@@ -794,8 +795,9 @@
pw.println("\t Inject an error event from VHAL for testing.");
pw.println("\tenable-uxr true|false");
pw.println("\t Enable/Disable UX restrictions and App blocking.");
- pw.println("\tgarage-mode [on|off|query]");
- pw.println("\t Force into garage mode or check status.");
+ pw.println("\tgarage-mode [on|off|query|reboot]");
+ pw.println("\t Force into or out of garage mode, or check status.");
+ pw.println("\t With 'reboot', enter garage mode, then reboot when it completes.");
pw.println("\tget-do-activities pkgname");
pw.println("\t Get Distraction Optimized activities in given package.");
pw.println("\tget-carpropertyconfig [propertyId]");
@@ -817,7 +819,7 @@
pw.println("\t--metrics");
pw.println("\t When used with dumpsys, only metrics will be in the dumpsys output.");
pw.println("\tset-zoneid-for-uid [zoneid] [uid]");
- pw.println("\t Maps the audio zoneid to uid.");
+ pw.println("\t Maps the audio zoneid to uid.");
pw.println("\tstart-fixed-activity displayId packageName activityName");
pw.println("\t Start an Activity the specified display as fixed mode");
pw.println("\tstop-fixed-mode displayId");
@@ -946,7 +948,7 @@
writer.println("Resume: Simulating resuming from Deep Sleep");
break;
case COMMAND_SUSPEND:
- mCarPowerManagementService.forceSimulatedSuspend();
+ mCarPowerManagementService.forceSuspendAndMaybeReboot(false);
writer.println("Resume: Simulating powering down to Deep Sleep");
break;
case COMMAND_ENABLE_TRUSTED_DEVICE:
@@ -1190,9 +1192,13 @@
case PARAM_QUERY_MODE:
mGarageModeService.dump(writer);
break;
+ case PARAM_REBOOT:
+ mCarPowerManagementService.forceSuspendAndMaybeReboot(true);
+ writer.println("Entering Garage Mode. Will reboot when it completes.");
+ break;
default:
writer.println("Unknown value. Valid argument: " + PARAM_ON_MODE + "|"
- + PARAM_OFF_MODE + "|" + PARAM_QUERY_MODE);
+ + PARAM_OFF_MODE + "|" + PARAM_QUERY_MODE + "|" + PARAM_REBOOT);
}
}