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

Commit 6558a5a1 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for... 

am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev

* commit 'fb6989e47fc1bb39fe87bbd263cd7491126117f7':
  Create an Application object for the system process.
parents 49965a8e e8e5ff31

core/java/android/app/ActivityThread.java

+2 −5
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ import libcore.io.DropBox; 
import libcore.io.EventLogger;

import libcore.io.IoUtils;

import libcore.net.event.NetworkEventDispatcher;



import dalvik.system.CloseGuard;

import dalvik.system.VMDebug;

import dalvik.system.VMRuntime;
@@ -5088,10 +5087,8 @@ public final class ActivityThread { 
                mInstrumentation = new Instrumentation();

                ContextImpl context = ContextImpl.createAppContext(

                        this, getSystemContext().mPackageInfo);

                Application app = Instrumentation.newApplication(Application.class, context);

                mAllApplications.add(app);

                mInitialApplication = app;

                app.onCreate();

                mInitialApplication = context.mPackageInfo.makeApplication(true, null);

                mInitialApplication.onCreate();

            } catch (Exception e) {

                throw new RuntimeException(

                        "Unable to instantiate Application():" + e.toString(), e);