commit 1b5d6e046e9c044c581f4666dc671b0e93646792
author Jia Zhao <jiaqzhao@google.com> Tue Oct 17 21:20:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 17 21:20:21 2017 +0000
tree 92adf45a4b01a11e7765904b243fc4eceed109c4
parent 03737863dddd40fe260608fc915317c8fba9800c
parent add9d74ef96fb98ab90e28eb114eaa409ebe97ec

Merge "Handle config changes in DecodeAccuracyTest activity" into oreo-cts-dev
am: add9d74ef9

Change-Id: I0dc3c42ee3c8d455f1734cdbea2e1a20f28a91dc

tests/tests/media/AndroidManifest.xml

diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index 9d2af70..482cd6a 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -40,7 +40,8 @@
             android:label="AudioManagerStubHelper"/>
         <activity android:name="android.media.cts.DecodeAccuracyTestActivity"
             android:label="DecodeAccuracyTestActivity"
-            android:screenOrientation="locked">
+            android:screenOrientation="locked"
+            android:configChanges="mcc|mnc|keyboard|keyboardHidden|orientation|screenSize|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />