commit 996e39f0a40b99a6acd4083a798bae6ef152bc3b
author Dongwon Kang <dwkang@google.com> Mon Jun 17 11:13:16 2019 -0700
committer Dongwon Kang <dwkang@google.com> Mon Jun 17 11:32:42 2019 -0700
tree 1a246078951ef6df40c5c60e461cc02694579466
parent 876c0c0e292a87057a1b38dd8b17268f65c938d7

swcodec: add a check for the case that the apex name is overridden.

Due to the lack of this check, the test was being skipped.

Test: atest media_swcodec_e2e_tests
Bug: 135294136
Change-Id: I35fa236ea24b4a92b36d99bdf00da43f1f40f8b8

tests/src/com/android/tests/apex/MediaSwCodecHostTest.java

diff --git a/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java b/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
index 040fc28..4ed064b 100644
--- a/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
+++ b/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
@@ -52,7 +52,8 @@
                                 throws DeviceNotAvailableException, IOException {
         // Run tests only when the device has swcodec apex installed.
         for (ApexInfo info : getDevice().getActiveApexes()) {
-            if (info.name.equals("com.android.media.swcodec")) {
+            if (info.name.equals("com.android.media.swcodec")
+                    || info.name.equals("com.google.android.media.swcodec")) {
                 doTestStageActivateUninstallApexPackage();
                 return;
             }