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

Commit c5931edb authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev 

* commit 'c65e4633':
  Optional <uses-permission> not yet supported.
parents 8a675b9a c65e4633

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -6865,7 +6865,6 @@ package android.content.pm { 
    method public abstract boolean addPermission(android.content.pm.PermissionInfo);

    method public abstract boolean addPermissionAsync(android.content.pm.PermissionInfo);

    method public abstract deprecated void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName);

    method public android.content.Intent buildPermissionRequestIntent(java.lang.String...);

    method public abstract java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]);

    method public abstract int checkPermission(java.lang.String, java.lang.String);

    method public abstract int checkSignatures(java.lang.String, java.lang.String);

core/java/android/content/pm/PackageInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class PackageInfo implements Parcelable { 
    /**

     * Flag for {@link #requestedPermissionsFlags}: the requested permission

     * is required for the application to run; the user can not optionally

     * disable it.

     * disable it.  Currently all permissions are required.

     */

    public static final int REQUESTED_PERMISSION_REQUIRED = 1<<0;

core/java/android/content/pm/PackageManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1754,6 +1754,7 @@ public abstract class PackageManager { 
    /**

     * Returns an {@link Intent} suitable for passing to {@code startActivityForResult}

     * which prompts the user to grant {@code permissions} to this application.

     * @hide

     *

     * @throws NullPointerException if {@code permissions} is {@code null}.

     * @throws IllegalArgumentException if {@code permissions} contains {@code null}.

core/java/android/content/pm/PackageParser.java

+3 −0
Original line number Diff line number Diff line
@@ -1407,8 +1407,11 @@ public class PackageParser { 
        // that may change.

        String name = sa.getNonResourceString(

                com.android.internal.R.styleable.AndroidManifestUsesPermission_name);

/*

        boolean required = sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestUsesPermission_required, true);

*/

        boolean required = true; // Optional <uses-permission> not supported



        sa.recycle();

core/res/res/values/attrs_manifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -996,8 +996,9 @@ 
              permission, and it must always be granted when it is installed.

              If you set this to false, then in some cases the application may

              be installed with it being granted the permission, and it will

              need to request the permission later if it needs it. -->

              need to request the permission later if it needs it.

        <attr name="required" format="boolean" />

        -->

    </declare-styleable>



    <!-- The <code>uses-configuration</code> tag specifies
@@ -1040,7 +1041,7 @@ 
              don't support it.  If you set this to false, then this will

              not impose a restriction on where the application can be

              installed. -->

        <attr name="required" />

        <attr name="required" format="boolean" />

    </declare-styleable>



    <!-- The <code>uses-sdk</code> tag describes the SDK features that the