diff options
| author | Justin Harrison <astyrrian@google.com> | 2015-09-19 00:29:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 00:29:40 +0000 |
| commit | 1f46395702f609d90909df39ab990844c0731952 (patch) | |
| tree | d818a2331879ba908299635dc1c8207e9e5fe5a3 /core/res/AndroidManifest.xml | |
| parent | bdfbd82154b58592597a70064c0806d774446746 (diff) | |
| parent | 91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6 (diff) | |
| download | frameworks_base-1f46395702f609d90909df39ab990844c0731952.zip frameworks_base-1f46395702f609d90909df39ab990844c0731952.tar.gz frameworks_base-1f46395702f609d90909df39ab990844c0731952.tar.bz2 | |
am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
Add support for setting color transforms
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5f4dd31..b051de4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2167,6 +2167,13 @@ <permission android:name="android.permission.CONTROL_WIFI_DISPLAY" android:protectionLevel="signature" /> + <!-- Allows an application to control the color transforms applied to + displays system-wide. + <p>Not for use by third-party applications.</p> + @hide --> + <permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_TRANSFORM" + android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to control VPN. <p>Not for use by third-party applications.</p> @hide --> |