diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-01-14 01:06:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 01:06:39 +0000 |
| commit | 45794a7d03bbf3e2019c780ed7c25b5de9f5112b (patch) | |
| tree | 55e65eae949794ee35c8fe5446ab9854e4431582 | |
| parent | f23ceedc5bb016c71be6d8e7b3153471e05fb220 (diff) | |
| parent | d4947e51b0b3336ff9da03275ff48a7632fe0268 (diff) | |
Merge "Revert "Changes needed to make Incoming calls work while fbe locked"" into ub-contactsdialer-b-dev
am: d4947e51b0
* commit 'd4947e51b0b3336ff9da03275ff48a7632fe0268':
Revert "Changes needed to make Incoming calls work while fbe locked"
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8d63dc139..f6aa4aad4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -296,8 +296,7 @@ android:launchMode="singleInstance" android:configChanges="keyboardHidden" android:exported="false" - android:screenOrientation="nosensor" - android:encryptionAware="true"> + android:screenOrientation="nosensor" > </activity> <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> @@ -305,8 +304,7 @@ android:exported="false" /> <service android:name="com.android.incallui.InCallServiceImpl" - android:permission="android.permission.BIND_INCALL_SERVICE" - android:encryptionAware="true"> + android:permission="android.permission.BIND_INCALL_SERVICE" > <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 ff9b1be5d..06aca78b5 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 != null && cursor.getCount() > 0); + listener.onHasBlockedNumbers(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 == null || cursor.getCount() != 1) { + if (cursor.getCount() != 1) { listener.onCheckComplete(null); return; } @@ -246,10 +246,9 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { startQuery(NO_TOKEN, new Listener() { @Override public void onQueryComplete(int token, Object cookie, Cursor cursor) { - int rowsReturned = cursor == null ? 0 : cursor.getCount(); - if (rowsReturned != 1) { + if (cursor.getCount() != 1) { throw new SQLiteDatabaseCorruptException - ("Returned " + rowsReturned + " rows for uri " + ("Returned " + cursor.getCount() + " rows for uri " + uri + "where 1 expected."); } cursor.moveToFirst(); |