New prebuilt
Need to target API 24 and not 'N'. Also made a small change to the docs
Bug: 29116156
Change-Id: I21c37aa04a4471ca6b3f7727e470129a78f92cf0
diff --git a/packages/CtsShim/CtsShimPriv.apk b/packages/CtsShim/CtsShimPriv.apk
index 48f35d3..b5dcc60 100644
--- a/packages/CtsShim/CtsShimPriv.apk
+++ b/packages/CtsShim/CtsShimPriv.apk
Binary files differ
diff --git a/packages/CtsShim/build/README b/packages/CtsShim/build/README
index 11e434f..a352840 100644
--- a/packages/CtsShim/build/README
+++ b/packages/CtsShim/build/README
@@ -23,11 +23,12 @@
update prebuilts:
$ cp out/target/product/shamu/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
- cts/hostsidetests/appsecurity/test-apps/IntentFilterApp
+ cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
$ cp out/target/product/shamu/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
frameworks/base/packages/CtsShim
revert manifest:
$ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd
-Finally, upload and submit both the cts/ and frameworks/base/ repos.
\ No newline at end of file
+Finally, upload and submit both the cts/ and frameworks/base/ repos.
+
diff --git a/packages/CtsShim/build/shim/AndroidManifest.xml b/packages/CtsShim/build/shim/AndroidManifest.xml
index ac32d94..24e942b 100644
--- a/packages/CtsShim/build/shim/AndroidManifest.xml
+++ b/packages/CtsShim/build/shim/AndroidManifest.xml
@@ -17,8 +17,10 @@
<!-- Manifest for the system CTS shim -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.android.cts.ctsshim"
- tools:ignore="MissingVersion" >
+ package="com.android.cts.ctsshim" >
+
+ <uses-sdk android:minSdkVersion="24"
+ android:targetSdkVersion="24" />
<application
android:hasCode="false"
diff --git a/packages/CtsShim/build/shim_priv/AndroidManifest.xml b/packages/CtsShim/build/shim_priv/AndroidManifest.xml
index 68c6a74..7ba76cf 100644
--- a/packages/CtsShim/build/shim_priv/AndroidManifest.xml
+++ b/packages/CtsShim/build/shim_priv/AndroidManifest.xml
@@ -17,8 +17,10 @@
<!-- Manifest for the privileged CTS shim -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.android.cts.priv.ctsshim"
- tools:ignore="MissingVersion" >
+ package="com.android.cts.priv.ctsshim" >
+
+ <uses-sdk android:minSdkVersion="24"
+ android:targetSdkVersion="24" />
<restrict-upgrade
android:hash="__HASH__" />
diff --git a/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml
index af96dfd..b938e3e 100644
--- a/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml
+++ b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml
@@ -17,8 +17,10 @@
<!-- Manifest for the privileged CTS shim upgrade -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.android.cts.priv.ctsshim"
- tools:ignore="MissingVersion" >
+ package="com.android.cts.priv.ctsshim" >
+
+ <uses-sdk android:minSdkVersion="24"
+ android:targetSdkVersion="24" />
<application
android:hasCode="false"