Revet "[3/3] InCallUI: allow disabling non intrusive incall ui"

Author: codex-corp

src/com/android/incallui/InCallPresenter.java

@@ -27,9 +27,7 @@
 import com.google.common.base.Preconditions;
 
 import android.content.Context;
-import android.content.ContentResolver;
 import android.content.Intent;
-import android.provider.Settings;
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -835,12 +833,9 @@ private void startUi(InCallState inCallState) {
             mCallUiInBackground = pm.isScreenOn() && !isKeyguardShowing;
         }
 
-        boolean nonIntrusiveDisabled = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.NON_INTRUSIVE_INCALL, 1) == 0;
-
         final PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         // If the screen is on, we'll prefer to not interrupt the user too much and slide in a card
-        if (pm.isScreenOn() && !nonIntrusiveDisabled) {
+        if (pm.isScreenOn()) {
             Intent intent = new Intent(mContext, InCallCardActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             mContext.startActivity(intent);