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

Commit 96811421 authored by Hui Yu's avatar Hui Yu Committed by Android (Google) Code Review
Browse files

Merge "Temp allowlist bluetooth broadcast to start FGS." into sc-dev

parents e9f52dec c4c90832

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

+2 −1
Original line number Diff line number Diff line
@@ -375,7 +375,8 @@ public class BluetoothMapService extends ProfileService { 
                        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, sRemoteDevice);

                        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                                BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS);

                        sendBroadcast(intent, BLUETOOTH_CONNECT);

                        sendBroadcast(intent, BLUETOOTH_CONNECT,

                                Utils.getTempAllowlistBroadcastOptions());

                        cancelUserTimeoutAlarm();

                        mIsWaitingAuthorization = false;

                        stopObexServerSessions(-1);

android/app/src/com/android/bluetooth/opp/BluetoothOppNotification.java

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.text.format.Formatter; 
import android.util.Log;



import com.android.bluetooth.R;

import com.android.bluetooth.Utils;



import java.util.HashMap;
@@ -349,7 +350,8 @@ class BluetoothOppNotification { 
                intent.putExtra(Constants.EXTRA_BT_OPP_TRANSFER_ID, item.id);

                intent.putExtra(Constants.EXTRA_BT_OPP_TRANSFER_PROGRESS, progress);

                intent.putExtra(Constants.EXTRA_BT_OPP_ADDRESS, item.destination);

                mContext.sendBroadcast(intent, Constants.HANDOVER_STATUS_PERMISSION);

                mContext.sendBroadcast(intent, Constants.HANDOVER_STATUS_PERMISSION,

                        Utils.getTempAllowlistBroadcastOptions());

                continue;

            }

            // Build the notification object

android/app/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.webkit.MimeTypeMap; 


import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.BluetoothObexTransport;

import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.MetricsLogger;



import java.io.FileNotFoundException;
@@ -605,7 +606,8 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler 
                        Constants.COUNT_HEADER_UNAVAILABLE);

            }

            intent.putExtra(Constants.EXTRA_BT_OPP_ADDRESS, destination);

            mContext.sendBroadcast(intent, Constants.HANDOVER_STATUS_PERMISSION);

            mContext.sendBroadcast(intent, Constants.HANDOVER_STATUS_PERMISSION,

                    Utils.getTempAllowlistBroadcastOptions());

        }

        mTimestamp = System.currentTimeMillis();

        mNumFilesAttemptedToReceive = 0;

android/app/src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.util.Log; 
import android.widget.Toast;



import com.android.bluetooth.R;

import com.android.bluetooth.Utils;



/**

 * Receives and handles: system broadcasts; Intents from other applications;
@@ -248,7 +249,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver { 
                    handoverIntent.putExtra(Constants.EXTRA_BT_OPP_TRANSFER_STATUS,

                            Constants.HANDOVER_TRANSFER_STATUS_FAILURE);

                }

                context.sendBroadcast(handoverIntent, Constants.HANDOVER_STATUS_PERMISSION);

                context.sendBroadcast(handoverIntent, Constants.HANDOVER_STATUS_PERMISSION,

                        Utils.getTempAllowlistBroadcastOptions());

                return;

            }

android/app/src/com/android/bluetooth/pan/PanService.java

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class PanService extends ProfileService { 
            Intent intent = new Intent(BluetoothPan.ACTION_TETHERING_STATE_CHANGED);

            intent.putExtra(BluetoothPan.EXTRA_TETHERING_STATE,

                    mTetherOn ? BluetoothPan.TETHERING_STATE_ON : BluetoothPan.TETHERING_STATE_OFF);

            sendBroadcast(intent, BLUETOOTH_CONNECT);

            sendBroadcast(intent, BLUETOOTH_CONNECT, Utils.getTempAllowlistBroadcastOptions());

        }

    }