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

am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo

Browse Source 
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
This commit is contained in:
Bjorn Bringert
2010-04-06 08:57:01 -07:00
committed by Android Git Automerger
parent 703cb72442 7d2511b722
commit 16419aca40
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/SearchableInfo.java
View File

@@ -258,9 +258,9 @@ public final class SearchableInfo implements Parcelable {
try {
theirContext = context.createPackageContext(activity.getPackageName(), 0);
} catch (PackageManager.NameNotFoundException e) {
// unexpected, but we deal with this by null-checking theirContext
Log.e(LOG_TAG, "Package not found " + activity.getPackageName());
} catch (java.lang.SecurityException e) {
// unexpected, but we deal with this by null-checking theirContext
Log.e(LOG_TAG, "Can't make context for " + activity.getPackageName(), e);
}
return theirContext;
@@ -552,7 +552,8 @@ public final class SearchableInfo implements Parcelable {
final ComponentName cName) {
SearchableInfo result = null;
Context activityContext = createActivityContext(context, cName);
if (activityContext == null) return null;
// in order to use the attributes mechanism, we have to walk the parser
// forward through the file until it's reading the tag of interest.
try {