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

Commit 92baafb4 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Moving Launcher permission to Framework. (Bug 10343529)" into klp-dev

parents 04b0840b 45167988

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ package android { 
    field public static final java.lang.String INJECT_EVENTS = "android.permission.INJECT_EVENTS";

    field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";

    field public static final java.lang.String INSTALL_PACKAGES = "android.permission.INSTALL_PACKAGES";

    field public static final java.lang.String INSTALL_SHORTCUT = "com.android.launcher.permission.INSTALL_SHORTCUT";

    field public static final java.lang.String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW";

    field public static final java.lang.String INTERNET = "android.permission.INTERNET";

    field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
@@ -132,6 +133,7 @@ package android { 
    field public static final java.lang.String SUBSCRIBED_FEEDS_WRITE = "android.permission.SUBSCRIBED_FEEDS_WRITE";

    field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";

    field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";

    field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";

    field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";

    field public static final java.lang.String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS";

    field public static final java.lang.String USE_SIP = "android.permission.USE_SIP";

core/res/AndroidManifest.xml

+21 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,27 @@ 
        android:label="@string/permlab_expandStatusBar"

        android:description="@string/permdesc_expandStatusBar" />



    <!-- ============================================================== -->

    <!-- Permissions related to adding/removing shortcuts from Launcher -->

    <!-- ============================================================== -->

    <eat-comment />



    <!-- Allows an application to install a shortcut in Launcher -->

    <permission

        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_install_shortcut"

        android:description="@string/permdesc_install_shortcut" />



        <!-- Allows an application to uninstall a shortcut in Launcher -->

    <permission

        android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_uninstall_shortcut"

        android:description="@string/permdesc_uninstall_shortcut"/>



    <!-- ==================================================== -->

    <!-- Permissions related to accessing sync settings   -->

    <!-- ==================================================== -->

core/res/res/values/strings.xml

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

    <string name="permdesc_expandStatusBar">Allows the app to expand or collapse the status bar.</string>



    <!-- Title of an application permission, listed so the user can install application shortcuts

    in their Launcher -->

    <string name="permlab_install_shortcut">install shortcuts</string>

    <!-- Description of an application permission, listed so the user can install application shortcuts

    in their Launcher -->

    <string name="permdesc_install_shortcut">Allows an application to add

        Homescreen shortcuts without user intervention.</string>



    <!-- Title of an application permission, listed so the user can uninstall application shortcuts

    in their Launcher -->

    <string name="permlab_uninstall_shortcut">uninstall shortcuts</string>

    <!-- Description of an application permission, listed so the user can install application shortcuts

    in their Launcher -->

    <string name="permdesc_uninstall_shortcut">Allows the application to remove

        Homescreen shortcuts without user intervention.</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_processOutgoingCalls">reroute outgoing calls</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->