diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-01-12 18:04:43 -0800 |
|---|---|---|
| committer | Brandon Maxwell <maxwelb@google.com> | 2016-01-13 14:45:03 -0800 |
| commit | 70b2cc2c5a9ca7f16c730f7329112416fee0fffd (patch) | |
| tree | a146af5a282fc91d75d8c931de9c5e00099875be /src | |
| parent | 90a13e94e3d918da73e83d80ab12c6e5f3f76f7e (diff) | |
Changes needed to make Incoming calls work while fbe locked
+ All in-call components are marked as encryptionAware so Telecom can
bind to and use them.
+ Added null checks on cursors. When in FBE locked state,
non-encryption aware ContentProviders return null
Bug=26542121
Change-Id: Ia49536c957d3d721401c05bf638fdd9dd371a731
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java | 9 |
1 files changed, 5 insertions, 4 deletions
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(); |