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

Commit e2e8da7c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 

* commit '7c2e76f0':
  Improve error reporting for issue #3183612
parents 3c9aa1aa 7c2e76f0

core/java/android/os/Looper.java

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ public class Looper { 
                    Log.wtf("Looper", "Thread identity changed from 0x"

                            + Long.toHexString(ident) + " to 0x"

                            + Long.toHexString(newIdent) + " while dispatching to "

                            + msg.target + " " + msg.callback + " what=" + msg.what);

                            + msg.target.getClass().getName() + " "

                            + msg.callback + " what=" + msg.what);

                }

                

                msg.recycle();

services/java/com/android/server/am/ActivityManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -6694,7 +6694,8 @@ public final class ActivityManagerService extends ActivityManagerNative 


        addErrorToDropBox("wtf", r, null, null, tag, null, null, crashInfo);



        if (Settings.Secure.getInt(mContext.getContentResolver(),

        if (r != null && r.pid != Process.myPid() &&

                Settings.Secure.getInt(mContext.getContentResolver(),

                        Settings.Secure.WTF_IS_FATAL, 0) != 0) {

            crashApplication(r, crashInfo);

            return true;