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

Commit 50caf534 authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Return with error logs instead of exception for unexpected nsi" am: 76507253 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541632



Change-Id: Ie4dd03ef21cb9a2080f49ead6c33ef767fc4a973
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa55b26f 76507253

telephony/java/android/telephony/TelephonyScanManager.java

+3 −2
Original line number Diff line number Diff line
@@ -153,8 +153,9 @@ public final class TelephonyScanManager { 
                    nsi = mScanInfo.get(message.arg2);

                }

                if (nsi == null) {

                    throw new RuntimeException(

                        "Failed to find NetworkScanInfo with id " + message.arg2);

                    Rlog.e(TAG, "Unexpceted message " + message.what

                            + " as there is no NetworkScanInfo with id " + message.arg2);

                    return;

                }



                final NetworkScanCallback callback = nsi.mCallback;