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

Commit 19e2d2c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed NPE in handover retry" am: f6f4840b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2035088

Change-Id: I0fada3cdd1dc9063665c6ad98987558571bd334e
parents d523996e f6f4840b

src/java/com/android/internal/telephony/data/DataRetryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ public class DataRetryManager extends Handler { 
            if (mDataRetryEntries.get(i) instanceof DataHandoverRetryEntry) {

                DataHandoverRetryEntry entry = (DataHandoverRetryEntry) mDataRetryEntries.get(i);

                if (entry.dataNetwork == dataNetwork

                        && entry.appliedDataRetryRule.equals(dataRetryRule)) {

                        && dataRetryRule.equals(entry.appliedDataRetryRule)) {

                    if (entry.getState() == DataRetryEntry.RETRY_STATE_SUCCEEDED

                            || entry.getState() == DataRetryEntry.RETRY_STATE_CANCELLED) {

                        break;