Merge "Add command to reset car mode in Telecom" into sc-dev
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index c7d3494..c0db71a 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -30,6 +30,7 @@
import android.Manifest;
import android.app.ActivityManager;
import android.app.AppOpsManager;
+import android.app.UiModeManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -1796,6 +1797,28 @@
}
}
+ /**
+ * A method intended for use in testing to reset car mode at all priorities.
+ *
+ * Runs during setup to avoid cascading failures from failing car mode CTS.
+ */
+ @Override
+ public void resetCarMode() {
+ Log.startSession("TCI.rCM");
+ try {
+ synchronized (mLock) {
+ enforceShellOnly(Binder.getCallingUid(), "resetCarMode");
+ Binder.withCleanCallingIdentity(() -> {
+ UiModeManager uiModeManager =
+ mContext.getSystemService(UiModeManager.class);
+ uiModeManager.disableCarMode(UiModeManager.DISABLE_CAR_MODE_ALL_PRIORITIES);
+ });
+ }
+ } finally {
+ Log.endSession();
+ }
+ }
+
@Override
public void setTestDefaultCallRedirectionApp(String packageName) {
try {