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

Commit 1934cc09 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Add system properties to config pairing UI" am: 749de490 am: f1a38f0c 

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



Change-Id: I1cac3d6f487d04a68c0ce9e04648bf8859e0c75f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cf5de48 f1a38f0c

android/app/src/com/android/bluetooth/Utils.java

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ public final class Utils { 
     */

    public static final char PAUSE = ',';

    public static final char WAIT = ';';

    public static final String PAIRING_UI_PROPERTY = "bluetooth.pairing_ui_package.name";



    private static boolean isPause(char c) {

        return c == 'p' || c == 'P';

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+4 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,10 @@ final class RemoteDevices { 
                // Send PAIRING_CANCEL intent to dismiss any dialog requesting bonding.

                intent = new Intent(BluetoothDevice.ACTION_PAIRING_CANCEL);

                intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

                intent.setPackage(mAdapterService.getString(R.string.pairing_ui_package));

                intent.setPackage(SystemProperties.get(

                        Utils.PAIRING_UI_PROPERTY,

                        mAdapterService.getString(R.string.pairing_ui_package)));



                Utils.sendBroadcast(mAdapterService, intent, BLUETOOTH_CONNECT,

                        Utils.getTempAllowlistBroadcastOptions());

            } else if (device.getBondState() == BluetoothDevice.BOND_NONE) {

android/app/src/com/android/bluetooth/hfp/AtPhonebook.java

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent; 
import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.SystemProperties;

import android.provider.CallLog.Calls;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.ContactsContract.PhoneLookup;
@@ -107,7 +108,9 @@ public class AtPhonebook { 


    public AtPhonebook(Context context, HeadsetNativeInterface nativeInterface) {

        mContext = context;

        mPairingPackage = context.getString(R.string.pairing_ui_package);

        mPairingPackage = SystemProperties.get(

            Utils.PAIRING_UI_PROPERTY,

            context.getString(R.string.pairing_ui_package));

        mContentResolver = context.getContentResolver();

        mNativeInterface = nativeInterface;

        mPhonebooks.put("DC", new PhonebookResult());  // dialled calls

android/app/src/com/android/bluetooth/map/BluetoothMapService.java

+7 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Message; 
import android.os.ParcelUuid;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.sysprop.BluetoothProperties;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -384,7 +385,9 @@ public class BluetoothMapService extends ProfileService { 
                case USER_TIMEOUT:

                    if (mIsWaitingAuthorization) {

                        Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL);

                        intent.setPackage(getString(R.string.pairing_ui_package));

                        intent.setPackage(SystemProperties.get(

                                Utils.PAIRING_UI_PROPERTY,

                                getString(R.string.pairing_ui_package)));

                        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, sRemoteDevice);

                        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                                BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS);
@@ -951,7 +954,9 @@ public class BluetoothMapService extends ProfileService { 
        if (sendIntent) {

            // This will trigger Settings app's dialog.

            Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST);

            intent.setPackage(getString(R.string.pairing_ui_package));

            intent.setPackage(SystemProperties.get(

                    Utils.PAIRING_UI_PROPERTY,

                    getString(R.string.pairing_ui_package)));

            intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                    BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS);

            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, sRemoteDevice);

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+4 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.os.HandlerThread; 
import android.os.Looper;

import android.os.Message;

import android.os.PowerManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.sysprop.BluetoothProperties;
@@ -457,7 +458,9 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
                    break;

                case USER_TIMEOUT:

                    Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL);

                    intent.setPackage(getString(R.string.pairing_ui_package));

                    intent.setPackage(SystemProperties.get(

                            Utils.PAIRING_UI_PROPERTY,

                            getString(R.string.pairing_ui_package)));

                    PbapStateMachine stateMachine = (PbapStateMachine) msg.obj;

                    intent.putExtra(BluetoothDevice.EXTRA_DEVICE, stateMachine.getRemoteDevice());

                    intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,