summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongwon Kang <dwkang@google.com>2019-06-17 18:43:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-17 18:43:25 -0700
commit862cc53a1b926efff7cdd2a6387f0f4b96bd6714 (patch)
tree1a246078951ef6df40c5c60e461cc02694579466
parent902645ac09e6b5cc4288c255ec449b87d2d8a37b (diff)
parent996e39f0a40b99a6acd4083a798bae6ef152bc3b (diff)
downloadplatform_system_apex-862cc53a1b926efff7cdd2a6387f0f4b96bd6714.tar.gz
platform_system_apex-862cc53a1b926efff7cdd2a6387f0f4b96bd6714.tar.bz2
platform_system_apex-862cc53a1b926efff7cdd2a6387f0f4b96bd6714.zip
swcodec: add a check for the case that the apex name is overridden.
am: 996e39f0a4 Change-Id: I6c1d9f3f9dfed6de9dc3a31a1f38a70b4b7f6e06
-rw-r--r--tests/src/com/android/tests/apex/MediaSwCodecHostTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java b/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
index 040fc28d..4ed064b4 100644
--- a/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
+++ b/tests/src/com/android/tests/apex/MediaSwCodecHostTest.java
@@ -52,7 +52,8 @@ public class MediaSwCodecHostTest extends ApexE2EBaseHostTest {
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;
}