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

Commit f288b43d authored by erfanian's avatar erfanian Committed by android-build-merger
Browse files

Merge changes Id7954667,I22de38dc 

am: b1e7530a

Change-Id: I3812e62448d4851afcea7d35842c27dd28b00b0c
parents 683e0868 b1e7530a

java/com/android/dialer/assisteddialing/ConcreteCreator.java

+3 −2
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ public final class ConcreteCreator { 


  // Floor set at N due to use of Optional.

  protected static final int BUILD_CODE_FLOOR = Build.VERSION_CODES.N;

  // Ceiling set at O because this feature will ship as part of the framework in P.

  @VisibleForTesting public static final int BUILD_CODE_CEILING = Build.VERSION_CODES.O;

  // Ceiling set at O_MR1 because this feature will ship as part of the framework in P.

  // TODO(erfanian): Switch to public build constant when 27 is available in public master.

  @VisibleForTesting public static final int BUILD_CODE_CEILING = 27;



  /**

   * Creates a new AssistedDialingMediator

java/com/android/dialer/precall/externalreceiver/LaunchPreCallActivity.java

+8 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.os.Bundle; 
import android.support.annotation.Nullable;

import com.android.dialer.callintent.CallInitiationType.Type;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.configprovider.ConfigProvider;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.logging.DialerImpression;

import com.android.dialer.logging.Logger;

import com.android.dialer.precall.PreCall;
@@ -50,13 +52,18 @@ public class LaunchPreCallActivity extends Activity { 
  public void onCreate(@Nullable Bundle savedInstanceState) {

    super.onCreate(savedInstanceState);

    Logger.get(this).logImpression(DialerImpression.Type.PRECALL_INITIATED_EXTERNAL);



    ConfigProvider configProvider = ConfigProviderBindings.get(getApplicationContext());

    Intent intent = getIntent();

    CallIntentBuilder builder = new CallIntentBuilder(intent.getData(), Type.EXTERNAL_INITIATION);

    builder

        .setPhoneAccountHandle(intent.getParcelableExtra(EXTRA_PHONE_ACCOUNT_HANDLE))

        .setIsVideoCall(intent.getBooleanExtra(EXTRA_IS_VIDEO_CALL, false))

        .setCallSubject(intent.getStringExtra(EXTRA_CALL_SUBJECT))

        .setAllowAssistedDial(intent.getBooleanExtra(EXTRA_ALLOW_ASSISTED_DIAL, false));

        .setAllowAssistedDial(

            intent.getBooleanExtra(

                EXTRA_ALLOW_ASSISTED_DIAL,

                configProvider.getBoolean("assisted_dialing_default_precall_state", false)));

    PreCall.start(this, builder);

    finish();

  }