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

Merge "Fix issue #8798662: NPE in..." into jb-mr2-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-05-03 20:47:38 +00:00
committed by Android (Google) Code Review
parent 2b662e8ef9 ca92a4c38f
commit d3956321c1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/am/ServiceRecord.java
View File

@@ -371,15 +371,15 @@ class ServiceRecord extends Binder {
return; return;
} }
try { try {
if (foregroundNoti.icon == 0) { if (localForegroundNoti.icon == 0) {
// It is not correct for the caller to supply a notification // It is not correct for the caller to supply a notification
// icon, but this used to be able to slip through, so for // icon, but this used to be able to slip through, so for
// those dirty apps give it the app's icon. // those dirty apps give it the app's icon.
foregroundNoti.icon = appInfo.icon; localForegroundNoti.icon = appInfo.icon;
// Do not allow apps to present a sneaky invisible content view either. // Do not allow apps to present a sneaky invisible content view either.
foregroundNoti.contentView = null; localForegroundNoti.contentView = null;
foregroundNoti.bigContentView = null; localForegroundNoti.bigContentView = null;
CharSequence appName = appInfo.loadLabel( CharSequence appName = appInfo.loadLabel(
ams.mContext.getPackageManager()); ams.mContext.getPackageManager());
if (appName == null) { if (appName == null) {
@@ -395,7 +395,7 @@ class ServiceRecord extends Binder {
appInfo.packageName, null)); appInfo.packageName, null));
PendingIntent pi = PendingIntent.getActivity(ams.mContext, 0, PendingIntent pi = PendingIntent.getActivity(ams.mContext, 0,
runningIntent, PendingIntent.FLAG_UPDATE_CURRENT); runningIntent, PendingIntent.FLAG_UPDATE_CURRENT);
foregroundNoti.setLatestEventInfo(ctx, localForegroundNoti.setLatestEventInfo(ctx,
ams.mContext.getString( ams.mContext.getString(
com.android.internal.R.string com.android.internal.R.string
.app_running_notification_title, .app_running_notification_title,
@@ -406,10 +406,10 @@ class ServiceRecord extends Binder {
appName), appName),
pi); pi);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
foregroundNoti.icon = 0; localForegroundNoti.icon = 0;
} }
} }
if (foregroundNoti.icon == 0) { if (localForegroundNoti.icon == 0) {
// Notifications whose icon is 0 are defined to not show // Notifications whose icon is 0 are defined to not show
// a notification, silently ignoring it. We don't want to // a notification, silently ignoring it. We don't want to
// just ignore it, we want to prevent the service from // just ignore it, we want to prevent the service from