diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-01-15 18:43:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-15 18:43:54 +0000 |
| commit | 61bd6fdc5c514f94ab96f6f36bdc469268622b21 (patch) | |
| tree | 99d471f39c31af44c8b8be797385bccb738cdd18 | |
| parent | 167bd12018429e57e4ddd77129daf124dcc2771f (diff) | |
| parent | 6773df0b1a6f8fd7f50c7ddc7a0fcf21c9df0253 (diff) | |
Merge "Changes needed to make Incoming calls work while fbe locked" into ub-contactsdialer-b-dev
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 91c91b940..67161ad5f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -294,7 +294,8 @@ android:launchMode="singleInstance" android:configChanges="keyboardHidden" android:exported="false" - android:screenOrientation="nosensor" > + android:screenOrientation="nosensor" + android:encryptionAware="true" > </activity> <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> @@ -302,7 +303,8 @@ android:exported="false" /> <service android:name="com.android.incallui.InCallServiceImpl" - android:permission="android.permission.BIND_INCALL_SERVICE" > + android:permission="android.permission.BIND_INCALL_SERVICE" + android:encryptionAware="true" > <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" /> <intent-filter> <action android:name="android.telecom.InCallService"/> diff --git a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java index 06aca78b5..ff9b1be5d 100644 --- a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java +++ b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java @@ -134,7 +134,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { new Listener() { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - listener.onHasBlockedNumbers(cursor.getCount() > 0); + listener.onHasBlockedNumbers(cursor != null && cursor.getCount() > 0); } }, getContentUri(null), @@ -161,7 +161,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { new Listener() { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - if (cursor.getCount() != 1) { + if (cursor == null || cursor.getCount() != 1) { listener.onCheckComplete(null); return; } @@ -246,9 +246,10 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { startQuery(NO_TOKEN, new Listener() { @Override public void onQueryComplete(int token, Object cookie, Cursor cursor) { - if (cursor.getCount() != 1) { + int rowsReturned = cursor == null ? 0 : cursor.getCount(); + if (rowsReturned != 1) { throw new SQLiteDatabaseCorruptException - ("Returned " + cursor.getCount() + " rows for uri " + ("Returned " + rowsReturned + " rows for uri " + uri + "where 1 expected."); } cursor.moveToFirst(); |