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

Commit 5a8f877c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 3202d380: Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE

Merge commit '3202d380' into froyo-plus-aosp

* commit '3202d380':
  Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
parents 86303198 3202d380
Loading
Loading
Loading
Loading
+56 −1
Original line number Original line Diff line number Diff line
@@ -27144,7 +27144,7 @@
 deprecated="not deprecated"
 deprecated="not deprecated"
 visibility="public"
 visibility="public"
>
>
<parameter name="fd" type="android.os.ParcelFileDescriptor">
<parameter name="newState" type="android.os.ParcelFileDescriptor">
</parameter>
</parameter>
</method>
</method>
</interface>
</interface>
@@ -37923,6 +37923,28 @@
 visibility="public"
 visibility="public"
>
>
</field>
</field>
<field name="ACTION_EXTERNAL_APPLICATIONS_AVAILABLE"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="ACTION_FACTORY_TEST"
<field name="ACTION_FACTORY_TEST"
 type="java.lang.String"
 type="java.lang.String"
 transient="false"
 transient="false"
@@ -38890,6 +38912,28 @@
 visibility="public"
 visibility="public"
>
>
</field>
</field>
<field name="EXTRA_CHANGED_PACKAGE_LIST"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;android.intent.extra.changed_package_list&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="EXTRA_CHANGED_UID_LIST"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;android.intent.extra.changed_uid_list&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="EXTRA_DATA_REMOVED"
<field name="EXTRA_DATA_REMOVED"
 type="java.lang.String"
 type="java.lang.String"
 transient="false"
 transient="false"
@@ -42658,6 +42702,17 @@
 visibility="public"
 visibility="public"
>
>
</field>
</field>
<field name="FLAG_EXTERNAL_STORAGE"
 type="int"
 transient="false"
 volatile="false"
 value="524288"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="FLAG_FACTORY_TEST"
<field name="FLAG_FACTORY_TEST"
 type="int"
 type="int"
 transient="false"
 transient="false"
+11 −0
Original line number Original line Diff line number Diff line
@@ -42702,6 +42702,17 @@
 visibility="public"
 visibility="public"
>
>
</field>
</field>
<field name="FLAG_EXTERNAL_STORAGE"
 type="int"
 transient="false"
 volatile="false"
 value="524288"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="FLAG_FACTORY_TEST"
<field name="FLAG_FACTORY_TEST"
 type="int"
 type="int"
 transient="false"
 transient="false"
+10 −8
Original line number Original line Diff line number Diff line
@@ -252,20 +252,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
    public static final int FLAG_RESTORE_ANY_VERSION = 1<<17;
    public static final int FLAG_RESTORE_ANY_VERSION = 1<<17;


    /**
    /**
     * Value for {@link #flags}: Set to true if the application has been
     * Value for {@link #flags}: Set to true if the application is
     * installed using the forward lock option.
     * currently installed on external/removable/unprotected storage.  Such
     *
     * applications may not be available if their storage is not currently
     * {@hide}
     * mounted.  When the storage it is on is not available, it will look like
     * the application has been uninstalled (its .apk is no longer available)
     * but its persistent data is not removed.
     */
     */
    public static final int FLAG_FORWARD_LOCK = 1<<19;
    public static final int FLAG_EXTERNAL_STORAGE = 1<<19;


    /**
    /**
     * Value for {@link #flags}: Set to true if the application is
     * Value for {@link #flags}: Set to true if the application has been
     * currently installed on the sdcard.
     * installed using the forward lock option.
     *
     *
     * {@hide}
     * {@hide}
     */
     */
    public static final int FLAG_EXTERNAL_STORAGE = 1<<20;
    public static final int FLAG_FORWARD_LOCK = 1<<20;


    /**
    /**
     * Value for {@link #flags}: Set to true if the application is
     * Value for {@link #flags}: Set to true if the application is