Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61bd6fdc authored by Brandon Maxwell's avatar Brandon Maxwell Committed by Android (Google) Code Review
Browse files

Merge "Changes needed to make Incoming calls work while fbe locked" into ub-contactsdialer-b-dev

parents 167bd120 6773df0b

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java

+5 −4
Original line number Diff line number Diff line
@@ -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();