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

Commit d592e5e1 authored by Rambo Wang's avatar Rambo Wang Committed by Gerrit Code Review
Browse files

Merge "Unlink death recipient when clearing up SignalStrengthUpdateRequest"

parents 03dc7465 0b12c060

src/java/com/android/internal/telephony/SignalStrengthController.java

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Iterator;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Set;

import java.util.TreeSet;

import java.util.concurrent.TimeUnit;
@@ -227,6 +228,11 @@ public class SignalStrengthController extends Handler { 
                while (it.hasNext()) {

                    SignalRequestRecord srr = it.next();

                    if (srr.mRequest.getLiveToken().equals(record.mRequest.getLiveToken())) {

                        try {

                            srr.mRequest.getLiveToken().unlinkToDeath(srr, 0);

                        } catch (NoSuchElementException ignored) {

                            // Either never linked or has already unlinked, ignore anyway

                        }

                        it.remove();

                    }

                }