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

Commit 164c2edc authored by Adam Skory's avatar Adam Skory
Browse files

Fix NPE in ActivityManagerService

Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
parent 63113994
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -8062,12 +8062,10 @@ public final class ActivityManagerService extends ActivityManagerNative
            if (activity == null) {
                Slog.w(TAG, "getAssistContextExtras error: no resumed activity");
                validActivity = false;
            }
            if (activity.app == null || activity.app.thread == null) {
            } else if (activity.app == null || activity.app.thread == null) {
                Slog.w(TAG, "getAssistContextExtras error: no process for " + activity);
                validActivity = false;
            }
            if (activity.app.pid == Binder.getCallingPid()) {
            } else if (activity.app.pid == Binder.getCallingPid()) {
                Slog.w(TAG, "getAssistContextExtras error: request process same as " + activity);
                validActivity = false;
            }