Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp

* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
This commit is contained in:
Ben Cheng
2010-03-29 16:25:13 -07:00
committed by Android Git Automerger
parent e9cd68f181 ef3f5ddc21
commit 8d0dc62fe2
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/ApplicationInfo.java
View File

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

2
core/java/android/content/pm/PackageParser.java
View File

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