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

am 8f8af564: am 56d8eeae: applications are at level 2

Browse Source 
Merge commit '8f8af564239c46e193f9994a38d7ded269e3c83e'

* commit '8f8af564239c46e193f9994a38d7ded269e3c83e':
  applications are at level 2
This commit is contained in:
Joe Onorato
2009-08-30 17:00:49 -07:00
committed by Android Git Automerger
parent 25d0a94125 8f8af56423
commit 229fc0f33e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Resource.cpp
View File

@@ -1710,7 +1710,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass
} else if (depth == 2 && tag == "application") {
inApplication = true;
}
if (depth == 3 && inApplication) {
if (inApplication) {
if (tag == "application" || tag == "activity" || tag == "service" || tag == "receiver"
|| tag == "provider") {
String8 name = getAttribute(tree, "http://schemas.android.com/apk/res/android",