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

Commit 7f32e10c authored by Muhammed Siju's avatar Muhammed Siju Committed by Gerrit - the friendly Code Review server
Browse files

Telephony(MSIM): Fix framework dex2oat failure in ART mode. 

Remove multisim check from ContextImpl class static initialisation block.
Multisim check calls SystemProperties.get() which invokes a native call
and causes dex2oat compilation to abort when using ART run time.

Change-Id: Idcfe0877162ba38ef7f2c625e8c126f82e13ce2c
CRs-Fixed: 574143
parent 90eb9e6c

core/java/android/app/ContextImpl.java

+4 −6
Original line number Diff line number Diff line
@@ -505,12 +505,10 @@ class ContextImpl extends Context { 
                    return new TelephonyManager(ctx.getOuterContext());

                }});



        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

        registerService(MSIM_TELEPHONY_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    return new MSimTelephonyManager(ctx.getOuterContext());

                }});

        }



        registerService(UI_MODE_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {