summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts
diff options
context:
space:
mode:
authorCostin Manolache <costin@google.com>2011-10-07 09:42:49 -0700
committerCostin Manolache <costin@google.com>2011-10-07 09:42:49 -0700
commit85e7279d9cc1ee8e4dd1f993a9e61a9eb547ecbc (patch)
tree63b471fe9c8db4e3a82aa11649573647c038ca31 /core/java/android/accounts
parent9d1c1835035222856a76d61a9c3edf8ce65207e4 (diff)
downloadframeworks_base-85e7279d9cc1ee8e4dd1f993a9e61a9eb547ecbc.zip
frameworks_base-85e7279d9cc1ee8e4dd1f993a9e61a9eb547ecbc.tar.gz
frameworks_base-85e7279d9cc1ee8e4dd1f993a9e61a9eb547ecbc.tar.bz2
b/5399355 StringIndexOutOfBoundsException from AccountManagerService
Change-Id: I13426a8b57d6fcbc7a43ffd61922439b0fae332c
Diffstat (limited to 'core/java/android/accounts')
-rw-r--r--core/java/android/accounts/AccountManagerService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 173da8d..2562cf1 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -1033,8 +1033,12 @@ public class AccountManagerService
mContext.getString(R.string.permission_request_notification_with_subtitle,
account.name);
final int index = titleAndSubtitle.indexOf('\n');
- final String title = titleAndSubtitle.substring(0, index);
- final String subtitle = titleAndSubtitle.substring(index + 1);
+ String title = titleAndSubtitle;
+ String subtitle = "";
+ if (index > 0) {
+ title = titleAndSubtitle.substring(0, index);
+ subtitle = titleAndSubtitle.substring(index + 1);
+ }
n.setLatestEventInfo(mContext,
title, subtitle,
PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));