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

Commit 3ec50749 authored by Brandon Maxwell's avatar Brandon Maxwell
Browse files

Revert "Changes needed to make Incoming calls work while fbe locked" 

This reverts commit 70b2cc2c.

Change-Id: I9ad37bf5bebf9a302c96038385d420e1c8c5f19b
parent 70b2cc2c

AndroidManifest.xml

+2 −4
Original line number Diff line number Diff line
@@ -294,8 +294,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. -->
@@ -303,8 +302,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"/>

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

+4 −5
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 != 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();