diff options
Diffstat (limited to 'tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java')
| -rw-r--r-- | tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java b/tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java index 59ea4abfe7d..5c5ac8917ae 100644 --- a/tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java +++ b/tests/framework/base/activitymanager/util/src/android/server/am/ActivityManagerTestBase.java @@ -25,6 +25,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE; import static android.content.pm.PackageManager.FEATURE_EMBEDDED; import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT; import static android.content.pm.PackageManager.FEATURE_LEANBACK; @@ -516,7 +517,8 @@ public abstract class ActivityManagerTestBase { protected boolean supportsInsecureLock() { return !hasDeviceFeature(FEATURE_LEANBACK) && !hasDeviceFeature(FEATURE_WATCH) - && !hasDeviceFeature(FEATURE_EMBEDDED); + && !hasDeviceFeature(FEATURE_EMBEDDED) + && !hasDeviceFeature(FEATURE_AUTOMOTIVE); } protected boolean isWatch() { @@ -803,7 +805,7 @@ public abstract class ActivityManagerTestBase { protected int getDeviceRotation(int displayId) { final String displays = runCommandAndPrintOutput("dumpsys display displays").trim(); Pattern pattern = Pattern.compile( - "(mDisplayId=" + displayId + ")([\\s\\S]*)(mOverrideDisplayInfo)(.*)" + "(mDisplayId=" + displayId + ")([\\s\\S]*?)(mOverrideDisplayInfo)(.*)" + "(rotation)(\\s+)(\\d+)"); Matcher matcher = pattern.matcher(displays); if (matcher.find()) { |