| commit | 16fa9fa64c6377ebe9eb423ccc93f06f40d6e3bb | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue May 21 01:23:01 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue May 21 01:23:01 2024 +0000 |
| tree | 1cbbb3cfa7833043acaa98bd63c6b3a22bc4720c | |
| parent | 9c07e8f5ae60fdb993a0eb0bddbbb103df5ee649 [diff] | |
| parent | ef39748b58f1c5a7c5e593d88fa8c63448500ccc [diff] |
Snap for 11865526 from ef39748b58f1c5a7c5e593d88fa8c63448500ccc to 24Q3-release Change-Id: Idc25be399f29ba0d79c04bab8e5a6548a4827b8d
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java index 61f4cba..c50e59a 100644 --- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java +++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java
@@ -43,7 +43,6 @@ public class MicrodroidCapabilitiesTest extends MicrodroidDeviceTestBase { @Test @CddTest(requirements = "9.17/C-1-6") - @Ignore("b/326092480") public void supportForProtectedOrNonProtectedVms() { assumeSupportedDevice();
diff --git a/vmlauncher_app/res/layout/activity_main.xml b/vmlauncher_app/res/layout/activity_main.xml index c588b19..e52dfcd 100644 --- a/vmlauncher_app/res/layout/activity_main.xml +++ b/vmlauncher_app/res/layout/activity_main.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -21,4 +21,4 @@ <requestFocus /> </SurfaceView> -</FrameLayout> +</merge>