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

Commit 8d0dc62f authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API. 

Merge commit 'ef3f5ddc' into froyo-plus-aosp

* commit 'ef3f5ddc':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
parents e9cd68f1 ef3f5ddc

api/current.xml

+11 −11
Original line number Diff line number Diff line
@@ -6884,17 +6884,6 @@ 
 visibility="public"

>

</field>

<field name="safeMode"

 type="int"

 transient="false"

 volatile="false"

 value="16843448"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="saveEnabled"

 type="int"

 transient="false"
@@ -8996,6 +8985,17 @@ 
 visibility="public"

>

</field>

<field name="vmSafeMode"

 type="int"

 transient="false"

 volatile="false"

 value="16843448"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="voiceLanguage"

 type="int"

 transient="false"

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

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    /**

     * Value for {@link #flags}: set to true if this application would like to

     * request the VM to operate under the safe mode. Comes from

     * {@link android.R.styleable#AndroidManifestApplication_safeMode

     * android:safeMode} of the &lt;application&gt; tag.

     * {@link android.R.styleable#AndroidManifestApplication_vmSafeMode

     * android:vmSafeMode} of the &lt;application&gt; tag.

     */

    public static final int FLAG_VM_SAFE_MODE = 1<<14;

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

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ public class PackageParser { 
        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestApplication_safeMode,

                com.android.internal.R.styleable.AndroidManifestApplication_vmSafeMode,

                false)) {

            ai.flags |= ApplicationInfo.FLAG_VM_SAFE_MODE;

        }

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
    

    <!-- Flag indicating whether the application requests the VM to operate in

         the safe mode.  -->

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

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



    <!-- Flag indicating whether the given application component is available

         to other applications.  If false, it can only be accessed by
@@ -709,7 +709,7 @@ 
             override the component specific values). -->

        <attr name="enabled" />

        <attr name="debuggable" />

        <attr name="safeMode" />

        <attr name="vmSafeMode" />

        <!-- Name of activity to be launched for managing the application's space on the device. -->

        <attr name="manageSpaceActivity" />

        <attr name="allowClearUserData" />

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ 
     =============================================================== -->

  <eat-comment />

  <public type="attr" name="installLocation" id="0x010102b7" />

  <public type="attr" name="safeMode" id="0x010102b8" />

  <public type="attr" name="vmSafeMode" id="0x010102b8" />

  <public type="attr" name="webTextViewStyle" id="0x010102b9" />

  <public type="attr" name="overscrollMode" id="0x010102ba" />

  <public type="attr" name="restoreAnyVersion" id="0x010102bb" />