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

Merge "b/5399355 StringIndexOutOfBoundsException from AccountManagerService"

Browse Source
This commit is contained in:
Costin Manolache
2011-10-07 17:54:05 -07:00
committed by Android (Google) Code Review
parent da71e80c5c 85e7279d9c
commit 6d288bd2f3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/accounts/AccountManagerService.java
View File

@@ -1033,8 +1033,12 @@ public class AccountManagerService
mContext.getString(R.string.permission_request_notification_with_subtitle, mContext.getString(R.string.permission_request_notification_with_subtitle,
account.name); account.name);
final int index = titleAndSubtitle.indexOf('\n'); final int index = titleAndSubtitle.indexOf('\n');
final String title = titleAndSubtitle.substring(0, index); String title = titleAndSubtitle;
final String subtitle = titleAndSubtitle.substring(index + 1); String subtitle = "";
if (index > 0) {
title = titleAndSubtitle.substring(0, index);
subtitle = titleAndSubtitle.substring(index + 1);
}
n.setLatestEventInfo(mContext, n.setLatestEventInfo(mContext,
title, subtitle, title, subtitle,
PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT)); PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));