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

Commit 307fbbf2 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 49fa9e00: Merge change Ibf6e51b7 into eclair 

Merge commit '49fa9e00' into eclair-mr2

* commit '49fa9e00':
  Set argv[0] from the main thread of an app, not a random binder thread
parents 883be83e 49fa9e00

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,6 @@ public final class ActivityThread { 
                Bundle instrumentationArgs, IInstrumentationWatcher instrumentationWatcher,

                int debugMode, boolean isRestrictedBackupMode, Configuration config,

                Map<String, IBinder> services) {

            Process.setArgV0(processName);



            if (services != null) {

                // Setup the service cache in the ServiceManager
@@ -3818,6 +3817,7 @@ public final class ActivityThread { 
        //Process.setUid(data.appInfo.uid);



        // send up app name; do this *before* waiting for debugger

        Process.setArgV0(data.processName);

        android.ddm.DdmHandleAppName.setAppName(data.processName);



        /*