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

Commit b26584cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev

parents b52a3419 d76cc0a4

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

+6 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public final class BluetoothPairingService extends Service { 
    return pairingIntent;

  }



  private boolean mRegistered = false;

  private final BroadcastReceiver mCancelReceiver = new BroadcastReceiver() {

    @Override

    public void onReceive(Context context, Intent intent) {
@@ -130,6 +131,7 @@ public final class BluetoothPairingService extends Service { 
    filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);

    filter.addAction(BluetoothDevice.ACTION_PAIRING_CANCEL);

    registerReceiver(mCancelReceiver, filter);

    mRegistered = true;



    startForeground(NOTIFICATION_ID, builder.getNotification());

    return START_REDELIVER_INTENT;
@@ -137,7 +139,10 @@ public final class BluetoothPairingService extends Service { 


  @Override

  public void onDestroy() {

    if (mRegistered) {

      unregisterReceiver(mCancelReceiver);

      mRegistered = false;

    }

    stopForeground(true);

  }