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

Commit 946e94bb authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Send bluetooth permission reply intent only to BT package 

Bug: 292540708
Test: make SettingsGoogle -j;
      Also manually tested clicking 'Allow' to message permission
      request dialog.
Change-Id: I3c339de2bf3bacd1e70f8dc8b0352aa83da14195
parent 253f634a

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.text.TextUtils;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.widget.Button;
@@ -209,6 +210,14 @@ public class BluetoothPermissionActivity extends AlertActivity implements 


    @VisibleForTesting

    void sendReplyIntentToReceiver(final boolean allowed, final boolean always) {

        String bluetoothName;

        try {

            bluetoothName = Utils.findBluetoothPackageName(this);

        } catch (NameNotFoundException e) {

            Log.e(TAG, "Failed to find bluetooth package name", e);

            return;

        }



        Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);



        if (DEBUG) {
@@ -216,6 +225,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
                    + " mReturnPackage");

        }



        intent.setPackage(bluetoothName);

        intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,

                        allowed ? BluetoothDevice.CONNECTION_ACCESS_YES

                                : BluetoothDevice.CONNECTION_ACCESS_NO);