Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ca3e73 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Remove FLASHLIGHT permission"

parents 89109a24 1463cebd

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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";

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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";

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+5 −8
Original line number Diff line number Diff line
@@ -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

core/res/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -1025,11 +1025,6 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <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. -->