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

Handle AccountManager failures so Shell doesn't crash.

Browse Source 
BUG: 27665208
Change-Id: Iccb6ce810c8e1c93bded58871d7ec220b7d14ba9
This commit is contained in:
Felipe Leme
2016-03-15 10:41:49 -07:00
parent 8a8e8ea19a
commit 213e355c77
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -1102,7 +1102,14 @@ public class BugreportProgressService extends Service {
preferredDomain = "@" + preferredDomain;
}
final Account[] accounts = am.getAccounts();
final Account[] accounts;
try {
accounts = am.getAccounts();
} catch (RuntimeException e) {
Log.e(TAG, "Could not get accounts for preferred domain " + preferredDomain, e);
return null;
}
if (DEBUG) Log.d(TAG, "Number of accounts: " + accounts.length);
Account foundAccount = null;
for (Account account : accounts) {
if (Patterns.EMAIL_ADDRESS.matcher(account.name).matches()) {