diff options
| author | Adrian Roos <roosa@google.com> | 2014-05-28 14:53:06 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-06-03 15:49:19 +0200 |
| commit | 18ea893a2319e2a192188d2288bb881149c9b06e (patch) | |
| tree | 0cb7c43ad9a7a6c28873697f1f133f985d74adaa /packages/Keyguard/test | |
| parent | becab9a7dbbfd5395e6889e7d73dd08c3406bf1a (diff) | |
| download | frameworks_base-18ea893a2319e2a192188d2288bb881149c9b06e.zip frameworks_base-18ea893a2319e2a192188d2288bb881149c9b06e.tar.gz frameworks_base-18ea893a2319e2a192188d2288bb881149c9b06e.tar.bz2 | |
Ensure trust agents are only provided by platform packages
Prevents the TrustManagerService from binding to any non-platform
trust agents and updates the SampleTrustAgent to use the new
permission.
Bug: 15287044
Change-Id: I38c3deebd5ad359075e68f52d19417bab5ab43db
Diffstat (limited to 'packages/Keyguard/test')
| -rw-r--r-- | packages/Keyguard/test/SampleTrustAgent/Android.mk | 5 | ||||
| -rw-r--r-- | packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/Keyguard/test/SampleTrustAgent/Android.mk b/packages/Keyguard/test/SampleTrustAgent/Android.mk index 7551fdf..2a18ee1 100644 --- a/packages/Keyguard/test/SampleTrustAgent/Android.mk +++ b/packages/Keyguard/test/SampleTrustAgent/Android.mk @@ -20,9 +20,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SampleTrustAgent -# Remove these to verify permission checks are working correctly -#LOCAL_CERTIFICATE := platform -#LOCAL_PRIVILEGED_MODULE := true +# Remove this to verify permission checks are working correctly +LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := tests diff --git a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml index 7904927..f3125f1 100644 --- a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml +++ b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml @@ -18,6 +18,7 @@ package="com.android.trustagent.test"> <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> <uses-permission android:name="android.permission.CONTROL_KEYGUARD" /> + <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" /> <application android:label="@string/app_name"> <service android:name=".SampleTrustAgent" |