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

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

@@ -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 <application> tag.
+     * {@link android.R.styleable#AndroidManifestApplication_vmSafeMode
+     * android:vmSafeMode} of the <application> tag.
      */
     public static final int FLAG_VM_SAFE_MODE = 1<<14;
 

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

@@ -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;
         }