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

Commit d14886b2 authored by Steven Liu's avatar Steven Liu Committed by Vineeta Srivastava
Browse files

StkAppService couldn't get the CatService instance. 

Stk app doesn't work.

Bug: 17298789
Change-Id: I0201cc0cdaf295eacbec36c4becfdb4862b63050
parent 1115f366

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() {