diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-04 20:04:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:04:55 +0000 |
| commit | b4df2f586ad7b5a0387489401de0c83203610ba9 (patch) | |
| tree | c31348086aae34cc2aa23610bc9e6ba8810d5292 /packages/Keyguard | |
| parent | 713059d4af8ae60b91b4f30ef7406dfa5c942955 (diff) | |
| parent | 1e9021aef89d53eb08d0e8a4e017c9e79d260241 (diff) | |
| download | frameworks_base-b4df2f586ad7b5a0387489401de0c83203610ba9.zip frameworks_base-b4df2f586ad7b5a0387489401de0c83203610ba9.tar.gz frameworks_base-b4df2f586ad7b5a0387489401de0c83203610ba9.tar.bz2 | |
am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
Ensure trust agents are only provided by platform packages
Diffstat (limited to 'packages/Keyguard')
| -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" |