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

Commit 6e520470 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the... 

am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev

* commit '73e74be1':
  Add a normal permission guarding the installer UI - used for stats tracking
parents 24c04059 73e74be1

api/current.txt

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

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

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

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

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

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

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

api/system-current.txt

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

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

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

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

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

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

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

core/java/android/content/Intent.java

+5 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,11 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Output: If {@link #EXTRA_RETURN_RESULT}, returns whether the install

     * succeeded.

     * <p>

     * <strong>Note:</strong>If your app is targeting API level higher than 22 you

     * need to hold {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES}

     * in order to launch the application installer.

     * </p>

     *

     * @see #EXTRA_INSTALLER_PACKAGE_NAME

     * @see #EXTRA_NOT_UNKNOWN_SOURCE

core/res/AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,6 @@ 
        android:label="@string/permlab_readSyncStats"

        android:protectionLevel="normal" />





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

    <!-- Permissions for low-level system interaction -->

    <!-- ============================================ -->
@@ -1933,6 +1932,14 @@ 
    <permission android:name="android.permission.SET_KEYBOARD_LAYOUT"

        android:protectionLevel="signature" />



    <!-- Allows an application to request installing packages. Apps

         targeting APIs greater than 22 must hold this permission in

         order to use {@link android.content.Intent#ACTION_INSTALL_PACKAGE}.-->

    <permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"

        android:label="@string/permlab_requestInstallPackages"

        android:description="@string/permdesc_requestInstallPackages"

        android:protectionLevel="normal" />



    <!-- @SystemApi Allows an application to install packages.

    <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.INSTALL_PACKAGES"

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,11 @@ 
    <!-- Description of an application permission that lets it read install sessions. -->

    <string name="permdesc_readInstallSessions">Allows an application to read install sessions. This allows it to see details about active package installations.</string>



    <!-- Title of an application permission that lets it read install sessions. -->

    <string name="permlab_requestInstallPackages">Request install packages</string>

    <!-- Description of an application permission that lets it read install sessions. -->

    <string name="permdesc_requestInstallPackages">Allows an application to request installation of packages.</string>



    <!-- Shown in the tutorial for tap twice for zoom control. -->

    <string name="tutorial_double_tap_to_zoom_message_short">Touch twice for zoom control</string>