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

Commit afb3e3cd authored by Varun Shah's avatar Varun Shah
Browse files

Fix NPE in ActivityThread.installProvider(). 

Bug: 330825131
Change-Id: I09ee6eecfe3672d35c24f85c89fe05f9c57e4347
Test: atest ActivityThreadTest
Flag: EXEMPT bugfix
parent da2a06af

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -8288,12 +8288,12 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

            Context c = null;

            ApplicationInfo ai = info.applicationInfo;

            if (context.getPackageName().equals(ai.packageName)) {

            if (context != null && context.getPackageName().equals(ai.packageName)) {

                c = context;

            } else if (mInitialApplication != null &&

                    mInitialApplication.getPackageName().equals(ai.packageName)) {

                c = mInitialApplication;

            } else {

            } else if (context != null) {

                try {

                    c = context.createPackageContext(ai.packageName,

                            Context.CONTEXT_INCLUDE_CODE);