diff options
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index a6d7e3c..be6119d 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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; } |