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

Commit 2bddffc8 authored by yueg's avatar yueg Committed by Copybara-Service
Browse files

Rollback the broadcast in-call UI changes since it breaks AOSP. 

Test: none
PiperOrigin-RevId: 177596967
Change-Id: Iac15302aca9593bfd4d1cbe5a8336ed6fd71b21c
parent 2ed4edf2

java/com/android/incallui/AndroidManifest.xml

+1 −9
Original line number Original line Diff line number Diff line
@@ -15,8 +15,7 @@ 
  -->

  -->





<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.incallui"

    package="com.android.incallui">

    xmlns:tools="http://schemas.android.com/tools">





  <uses-sdk

  <uses-sdk

      android:minSdkVersion="23"

      android:minSdkVersion="23"
@@ -38,13 +37,6 @@ 
  <!-- Testing location -->

  <!-- Testing location -->

  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>





  <!-- Broadcasting in-call UI changes -->

  <uses-permission android:name="com.motorola.incallui.permission.INCOMING_CALL_VISIBILITY_CHANGED" />

  <!-- System permission to restrict access to Intent INCOMING_CALL_VISIBILITY_CHANGED. -->

  <permission android:name="com.motorola.incallui.permission.INCOMING_CALL_VISIBILITY_CHANGED"

      android:protectionLevel="signatureOrSystem"

      tools:ignore="SignatureOrSystemPermissions"/>



  <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper

  <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper

  navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a

  navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a

  call.

  call.

java/com/android/incallui/InCallPresenter.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -260,8 +260,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud 
  private VideoSurfaceTexture mLocalVideoSurfaceTexture;

  private VideoSurfaceTexture mLocalVideoSurfaceTexture;

  private VideoSurfaceTexture mRemoteVideoSurfaceTexture;

  private VideoSurfaceTexture mRemoteVideoSurfaceTexture;





  private MotorolaInCallUiNotifier motorolaInCallUiNotifier;



  /** Inaccessible constructor. Must use getRunningInstance() to get this singleton. */

  /** Inaccessible constructor. Must use getRunningInstance() to get this singleton. */

  @VisibleForTesting

  @VisibleForTesting

  InCallPresenter() {}

  InCallPresenter() {}
@@ -384,15 +382,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud 




    AudioModeProvider.getInstance().addListener(this);

    AudioModeProvider.getInstance().addListener(this);





    if (motorolaInCallUiNotifier == null) {

      // Add listener to notify Telephony process when the incoming call screen is started or

      // finished. This is for hiding USSD dialog because the incoming call screen should have

      // higher precedence over this dialog.

      motorolaInCallUiNotifier = new MotorolaInCallUiNotifier(context);

      addInCallUiListener(motorolaInCallUiNotifier);

      addListener(motorolaInCallUiNotifier);

    }



    LogUtil.d("InCallPresenter.setUp", "Finished InCallPresenter.setUp");

    LogUtil.d("InCallPresenter.setUp", "Finished InCallPresenter.setUp");

    Trace.endSection();

    Trace.endSection();

  }

  }
@@ -1469,8 +1458,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud 
      }

      }

      mCallList = null;

      mCallList = null;





      motorolaInCallUiNotifier = null;



      mContext = null;

      mContext = null;

      mInCallActivity = null;

      mInCallActivity = null;

      mManageConferenceActivity = null;

      mManageConferenceActivity = null;

java/com/android/incallui/MotorolaInCallUiNotifier.java

deleted100644 → 0
+0 −77
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * This file is derived in part from code issued under the following license.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */

package com.android.incallui;



import android.content.Context;

import android.content.Intent;

import android.support.annotation.VisibleForTesting;

import com.android.dialer.common.LogUtil;

import com.android.incallui.InCallPresenter.InCallState;

import com.android.incallui.InCallPresenter.InCallStateListener;

import com.android.incallui.InCallPresenter.InCallUiListener;

import com.android.incallui.call.CallList;



/**

 * Responsible for broadcasting the Intent INCOMING_CALL_VISIBILITY_CHANGED so other processes could

 * know when the incoming call activity is started or finished.

 */

public class MotorolaInCallUiNotifier implements InCallUiListener, InCallStateListener {



  @VisibleForTesting static final String EXTRA_VISIBLE_KEY = "visible";



  @VisibleForTesting

  static final String ACTION_INCOMING_CALL_VISIBILITY_CHANGED =

      "com.motorola.incallui.action.INCOMING_CALL_VISIBILITY_CHANGED";



  @VisibleForTesting

  static final String PERMISSION_INCOMING_CALL_VISIBILITY_CHANGED =

      "com.motorola.incallui.permission.INCOMING_CALL_VISIBILITY_CHANGED";



  private final Context mContext;



  MotorolaInCallUiNotifier(Context context) {

    mContext = context;

  }



  @Override

  public void onUiShowing(boolean showing) {

    if (showing && CallList.getInstance().getIncomingCall() != null) {

      sendInCallUiBroadcast(mContext, true);

    }

  }



  @Override

  public void onStateChange(InCallState oldState, InCallState newState, CallList callList) {

    if (oldState != null

        && oldState.isConnectingOrConnected()

        && newState == InCallState.NO_CALLS) {

      sendInCallUiBroadcast(mContext, false);

    }

  }



  private void sendInCallUiBroadcast(Context context, boolean visible) {

    LogUtil.d(

        "MotorolaInCallUiNotifier.sendInCallUiBroadcast",

        "Send InCallUi Broadcast, visible: " + visible);

    Intent intent = new Intent();

    intent.putExtra(EXTRA_VISIBLE_KEY, visible);

    intent.setAction(ACTION_INCOMING_CALL_VISIBILITY_CHANGED);

    context.sendBroadcast(intent, PERMISSION_INCOMING_CALL_VISIBILITY_CHANGED);

  }

}