| commit | a7c14c686b982836b75aba4618fc738093a9878c | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Mon Nov 24 12:03:07 2014 -0800 |
| committer | Jay Shrauner <shrauner@google.com> | Mon Nov 24 12:24:16 2014 -0800 |
| tree | 88c14ba3195fa1d743363d818453a1b115a5d5e1 | |
| parent | 71c20f20884b4775f05a7f0a951a36b3a14747f1 [diff] |
Don't crash in loader on SecurityExceptions Prevent crashes when GAL search fails due to provider authority mismatch. Bug:18507854 Change-Id: I047754dcc6214a6b27661baea3a15c8d9866ecce
diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java index c19737d..698ef96 100644 --- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java +++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
@@ -61,8 +61,8 @@ Cursor cursor = null; try { cursor = super.loadInBackground(); - } catch (NullPointerException e) { - // Ignore NPEs thrown by providers + } catch (NullPointerException | SecurityException e) { + // Ignore NPEs and SecurityExceptions thrown by providers } final Cursor contactsCursor = cursor; cursors.add(contactsCursor);