Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug: 2553512
Change-Id: Id0dad80ecdcb8c7430dcf1ac26132ccd9c0770f5
diff --git a/api/current.xml b/api/current.xml
index 5609a63..da47553 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -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"
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 32cd2d5..ae38af6 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -194,8 +194,8 @@
/**
* 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 <application> tag.
+ * {@link android.R.styleable#AndroidManifestApplication_vmSafeMode
+ * android:vmSafeMode} of the <application> tag.
*/
public static final int FLAG_VM_SAFE_MODE = 1<<14;
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 3be4cebd..fb52d2e 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1510,7 +1510,7 @@
}
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;
}
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 4e2f9c3..fc5edb3 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -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" />
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index ef6719df..940cbf7 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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" />
