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

Commit 43ca823f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "wtf() should not be fatal for core components."

parents d5d94698 9ccb85d3

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

+5 −3
Original line number Diff line number Diff line
@@ -13523,9 +13523,11 @@ public class ActivityManagerService extends IActivityManager.Stub 
        final ProcessRecord r = handleApplicationWtfInner(callingUid, callingPid, app, tag,

                crashInfo);













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













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













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













        final boolean isFatal = "eng".equals(Build.TYPE) || Settings.Global













                .getInt(mContext.getContentResolver(), Settings.Global.WTF_IS_FATAL, 0) != 0;













        final boolean isSystem = (r == null) || r.persistent;

























        if (isFatal && !isSystem) {















            mAppErrors.crashApplication(r, crashInfo);















            return true;















        } else {