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

Commit 9cdd52b3 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix queryCLIP's ClassCastException" am: 23a1fb6f 

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

Change-Id: I79b832ff7deb14b22232f96f03aa0c88cf34930c
parents 265d3f65 23a1fb6f

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1837,9 +1837,9 @@ public class ImsPhone extends ImsPhoneBase { 
                break;

                break;





            case EVENT_GET_CLIP_DONE:

            case EVENT_GET_CLIP_DONE:

                Bundle ssInfoResp = null;

                ImsSsInfo ssInfoResp = null;

                if (ar.exception == null) {

                if (ar.exception == null && ar.result instanceof ImsSsInfo) {

                    ssInfoResp = (Bundle) ar.result;

                    ssInfoResp = (ImsSsInfo) ar.result;

                }

                }

                if (ss != null) {

                if (ss != null) {

                    sendResponseOrRetryOnCsfbSs(ss, msg.what, ar.exception, ssInfoResp);

                    sendResponseOrRetryOnCsfbSs(ss, msg.what, ar.exception, ssInfoResp);