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

Commit 3cb75c65 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents b75ec21b 7f32e10c

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