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

am 007ad770: merge from open-source master

Browse Source 
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
This commit is contained in:
The Android Open Source Project
2010-05-03 16:25:15 -07:00
committed by Android Git Automerger
parent 05bcf7553e 007ad7700a
commit dcb5f18fd6
4 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/PackageManagerService.java
View File

@@ -2375,7 +2375,7 @@ class PackageManagerService extends IPackageManager.Stub {
&& (p.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) != 0
&& (!mSafeMode || (p.applicationInfo.flags
&ApplicationInfo.FLAG_SYSTEM) != 0)) {
finalList.add(p.applicationInfo);
finalList.add(PackageParser.generateApplicationInfo(p, flags));
}
}
}