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

Commit 48b86316 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android (Google) Code Review
Browse files

Merge "StkAppService couldn't get the CatService instance." into lmp-dev

parents 004f7009 d14886b2

src/java/com/android/internal/telephony/cat/CatService.java

+19 −5
Original line number Diff line number Diff line
@@ -191,12 +191,26 @@ public class CatService extends Handler implements AppInterface { 
            }

        }



        synchronized (sInstanceLock) {

            if (sInstance == null) {

                if (ci == null || ca == null || ir == null || context == null || fh == null

                        || ic == null) {

                    return null;

                }



        return new CatService(ci, ca, ir, context, fh, ic, slotId);

                sInstance = new CatService(ci, ca, ir, context, fh, ic, slotId);

            } else if ((ir != null) && (mIccRecords != ir)) {

                if (mIccRecords != null) {

                    mIccRecords.unregisterForRecordsLoaded(sInstance);

                }



                mIccRecords = ir;

                mUiccApplication = ca;



                mIccRecords.registerForRecordsLoaded(sInstance, MSG_ID_ICC_RECORDS_LOADED, null);

            }

            return sInstance;

        }

    }



    public void dispose() {