commit 81bcaea37e960391107e2a531a51862161d80de0
author Sean Midford <midfords@google.com> Wed Nov 23 02:16:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 23 02:16:48 2016 +0000
tree 28920f545fdea7c4a6d5025a485507079b8266aa
parent 734af6a1e0072d448b71ccec4d1115a9c7e86d7c
parent d3bf8fc52b63e729b2e38ecfc96a7f0e42128175

Changed layout of dialogs for a11y
am: d3bf8fc52b

Change-Id: I4f673281faa8aa52ed5b9cbd1700501af4b0c3ef

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 285774d..5bdf99d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10613"
-    android:versionName="1.6.13">
+    android:versionCode="10700"
+    android:versionName="1.7.0">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 

src/com/android/contacts/common/list/FavoritesAndContactsLoader.java

diff --git a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
index 422cf7c..25dd711 100644
--- a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
@@ -19,6 +19,7 @@
 import android.content.CursorLoader;
 import android.database.Cursor;
 import android.database.MergeCursor;
+import android.database.sqlite.SQLiteException;
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 
@@ -73,8 +74,9 @@
         // correctly handles null cursors.
         try {
             return super.loadInBackground();
-        } catch (NullPointerException | SecurityException e) {
-            // Ignore NPEs and SecurityExceptions thrown by providers
+
+        } catch (NullPointerException | SQLiteException | SecurityException e) {
+            // Ignore NPEs, SQLiteExceptions and SecurityExceptions thrown by providers
         }
         return null;
     }