am ce7a3837: am a7c79b3f: am fd41eda0: Move android.security test service to stub package
* commit 'ce7a383777090cbd13773e97a5a5d23eed248db3':
Move android.security test service to stub package
diff --git a/tests/Android.mk b/tests/Android.mk
index 15705dd..4a87b07 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,7 +20,8 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)\
$(call all-renderscript-files-under, src)\
src/android/app/cts/ISecondary.aidl\
- src/android/os/cts/IEmptyService.aidl
+ src/android/os/cts/IEmptyService.aidl\
+ src/android/security/cts/activity/ISecureRandomService.aidl
LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 590ee36..f487ab0 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -106,7 +106,10 @@
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.READ_SYNC_STATS" />
-
+
+ <!-- Used for ClonedSecureRandomTest -->
+ <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+
<!-- Used for PackageManager test, don't delete this permission-tree -->
<permission-tree android:name="com.android.cts.stub.permission.TEST_DYNAMIC"
android:label="Test Tree"/>
@@ -973,6 +976,9 @@
<activity android:name="android.renderscript.cts.RenderscriptGLStubActivity"
android:label="RenderscriptGLStub"/>
+
+ <service android:name="android.security.cts.activity.SecureRandomService"
+ android:process=":secureRandom"/>
</application>
diff --git a/tests/tests/security/src/android/security/cts/activity/ISecureRandomService.aidl b/tests/src/android/security/cts/activity/ISecureRandomService.aidl
similarity index 100%
rename from tests/tests/security/src/android/security/cts/activity/ISecureRandomService.aidl
rename to tests/src/android/security/cts/activity/ISecureRandomService.aidl
diff --git a/tests/tests/security/src/android/security/cts/activity/SecureRandomService.java b/tests/src/android/security/cts/activity/SecureRandomService.java
similarity index 100%
rename from tests/tests/security/src/android/security/cts/activity/SecureRandomService.java
rename to tests/src/android/security/cts/activity/SecureRandomService.java
diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk
index 43b615f..f36be9d 100644
--- a/tests/tests/security/Android.mk
+++ b/tests/tests/security/Android.mk
@@ -24,8 +24,7 @@
LOCAL_JNI_SHARED_LIBRARIES := libctssecurity_jni
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- src/android/security/cts/activity/ISecureRandomService.aidl
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsSecurityTestCases
diff --git a/tests/tests/security/AndroidManifest.xml b/tests/tests/security/AndroidManifest.xml
index 2048de9..771a184 100644
--- a/tests/tests/security/AndroidManifest.xml
+++ b/tests/tests/security/AndroidManifest.xml
@@ -23,14 +23,11 @@
<application>
<uses-library android:name="android.test.runner" />
-
- <service android:name="android.security.cts.activity.SecureRandomService"
- android:process=":secureRandom"/>
</application>
<instrumentation android:name="android.test.InstrumentationCtsTestRunner"
- android:targetPackage="com.android.cts.security"
- android:label="CTS tests of com.android.cts.security"/>
+ android:targetPackage="com.android.cts.stub"
+ android:label="CTS tests of com.android.cts.stub"/>
</manifest>