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

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

am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417:... 

am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo

Merge commit '44f2c6ba' into kraken

* commit '44f2c6ba':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
parents 7a61b840 44f2c6ba

api/8.xml

+1 −1
Original line number Diff line number Diff line
@@ -42706,7 +42706,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="524288"

 value="262144"

 static="true"

 final="true"

 deprecated="not deprecated"

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -46182,7 +46182,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="524288"

 value="262144"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * the application has been uninstalled (its .apk is no longer available)

     * but its persistent data is not removed.

     */

    public static final int FLAG_EXTERNAL_STORAGE = 1<<19;

    public static final int FLAG_EXTERNAL_STORAGE = 1<<18;



    /**

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