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

Commit ee47b571 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ibadc31b0,I5b453a68 am: 818ad18a am: cfc9f765 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1549975

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3faf029f7379cfabadecfaf229f774626bd45066
parents fef43caa cfc9f765

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ 
                 android:resource="@xml/authenticator"/>

        </service>

        <service

            android:name=".hfp.BluetoothInCallService"

            android:name=".telephony.BluetoothInCallService"

            android:permission="android.permission.BIND_INCALL_SERVICE"

            android:process="@string/process"

            android:enabled="@bool/profile_supported_hfp_incallservice"

src/com/android/bluetooth/btservice/AdapterState.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.os.Message; 
import android.util.Log;



import com.android.bluetooth.R;

import com.android.bluetooth.hfp.BluetoothInCallService;

import com.android.bluetooth.telephony.BluetoothInCallService;

import com.android.bluetooth.statemachine.State;

import com.android.bluetooth.statemachine.StateMachine;

src/com/android/bluetooth/hfp/HeadsetSystemInterface.java

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;

import com.android.bluetooth.telephony.BluetoothInCallService;

import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.Context;

src/com/android/bluetooth/hfp/BluetoothCall.java→src/com/android/bluetooth/telephony/BluetoothCall.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.hfp;

package com.android.bluetooth.telephony;



import android.net.Uri;

import android.os.Bundle;

src/com/android/bluetooth/hfp/BluetoothInCallService.java→src/com/android/bluetooth/telephony/BluetoothInCallService.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.hfp;

package com.android.bluetooth.telephony;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothHeadset;
@@ -41,6 +41,8 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.Log;



import com.android.bluetooth.hfp.BluetoothHeadsetProxy;



import androidx.annotation.VisibleForTesting;



import java.util.ArrayList;