diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-24 12:03:07 -0800 |
|---|---|---|
| committer | Natiq Ahmed <mnatiq@codeaurora.org> | 2015-03-13 14:00:02 +0530 |
| commit | f5c651f97e643f1c360edd15350dc8ce6fabbfb8 (patch) | |
| tree | a184177db7db68f606632f5dd2e1e451610bbd4e | |
| parent | facf3ae9dded8875091aa8e200e41398cd140e12 (diff) | |
| download | android_packages_apps_ContactsCommon-f5c651f97e643f1c360edd15350dc8ce6fabbfb8.tar.gz android_packages_apps_ContactsCommon-f5c651f97e643f1c360edd15350dc8ce6fabbfb8.tar.bz2 android_packages_apps_ContactsCommon-f5c651f97e643f1c360edd15350dc8ce6fabbfb8.zip | |
Don't crash in loader on SecurityExceptions
Prevent crashes when GAL search fails due to provider authority mismatch.
Bug:18507854
Change-Id: I047754dcc6214a6b27661baea3a15c8d9866ecce
| -rw-r--r-- | src/com/android/contacts/common/list/ProfileAndContactsLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java index c19737d9..698ef96f 100644 --- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java +++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java @@ -61,8 +61,8 @@ public class ProfileAndContactsLoader extends CursorLoader { 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); |