diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 13 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
5 files changed, 5 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index 4875169b3788..30d302093272 100644 --- a/api/current.txt +++ b/api/current.txt @@ -67,7 +67,6 @@ package android { field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; - field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; diff --git a/api/system-current.txt b/api/system-current.txt index a40d28ee099c..d7393b738d14 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -93,7 +93,6 @@ package android { field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; - field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT"; field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK"; field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; diff --git a/api/test-current.txt b/api/test-current.txt index a438fcdd5012..9058fe7d8b88 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -67,7 +67,6 @@ package android { field public static final java.lang.String DUMP = "android.permission.DUMP"; field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR"; field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST"; - field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 37af59f1bd4a..c154e91bb559 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -889,6 +889,11 @@ android:protectionLevel="normal" android:permissionFlags="hidden"/> + <!-- @hide We need to keep this around for backwards compatibility --> + <permission android:name="android.permission.FLASHLIGHT" + android:protectionLevel="normal" + android:permissionFlags="hidden"/> + <!-- ====================================================================== --> <!-- INSTALL PERMISSIONS --> <!-- ====================================================================== --> @@ -1194,14 +1199,6 @@ android:description="@string/permdesc_vibrate" android:protectionLevel="normal" /> - <!-- Allows access to the flashlight. - <p>Protection level: normal - --> - <permission android:name="android.permission.FLASHLIGHT" - android:label="@string/permlab_flashlight" - android:description="@string/permdesc_flashlight" - android:protectionLevel="normal" /> - <!-- Allows using PowerManager WakeLocks to keep processor from sleeping or screen from dimming. <p>Protection level: normal diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 347f2f912e41..be9ba62baa3a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1026,11 +1026,6 @@ <string name="permdesc_vibrate">Allows the app to control the vibrator.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_flashlight">control flashlight</string> - <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_flashlight">Allows the app to control the flashlight.</string> - - <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_callPhone">directly call phone numbers</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_callPhone">Allows the app to call phone numbers |