From 28ac08943d60932a50281f24af0fa181111cff60 Mon Sep 17 00:00:00 2001
From: Pyry Haulos <phaulos@google.com>
Date: Tue, 30 Sep 2014 10:52:42 -0700
Subject: [PATCH] Add screenSize to configChanges to avoid activity restarts
 when built through CTS build system which overrides minSdkVersion.

Change-Id: I570a691999765ba277983230fb6436c7fb50b700
---
 android/package/AndroidManifest.xml | 4 ++--
 android/scripts/common.py           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/package/AndroidManifest.xml b/android/package/AndroidManifest.xml
index c5e7cae..12e3681 100644
--- a/android/package/AndroidManifest.xml
+++ b/android/package/AndroidManifest.xml
@@ -32,7 +32,7 @@
 		<activity android:name="android.app.NativeActivity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="dEQP Test Process"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|screenSize|keyboardHidden"
 				  android:exported="true"
 				  android:process=":testercore">
 			<meta-data android:name="android.app.lib_name"
@@ -42,7 +42,7 @@
 		</activity>
     </application>
 	
-    <uses-sdk android:minSdkVersion="7"/>
+    <uses-sdk android:minSdkVersion="13"/>
     <uses-feature android:glEsVersion="0x00020000"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.GET_TASKS" />
diff --git a/android/scripts/common.py b/android/scripts/common.py
index e1f6c08..1f5627a 100644
--- a/android/scripts/common.py
+++ b/android/scripts/common.py
@@ -77,7 +77,7 @@ NATIVE_LIBS				= [
 		NativeLib("testercore",			9,	"armeabi-v7a"),		# ARM v7a ABI
 #		NativeLib("testercore",			9,	"x86"),				# x86
 	]
-ANDROID_JAVA_API		= "android-10"
+ANDROID_JAVA_API		= "android-13"
 
 # NDK paths
 ANDROID_NDK_HOST_OS		= getCfg({
-- 
2.7.4