diff options
| author | Adam Skory <skory@google.com> | 2013-08-13 13:32:31 -0700 |
|---|---|---|
| committer | Adam Skory <skory@google.com> | 2013-08-13 14:24:34 -0700 |
| commit | 164c2edccd7e27ff9d34fb81f5019088a31d2b56 (patch) | |
| tree | 292f59686743e03eaf22d790ab870a05a1c3eef7 | |
| parent | 63113994034e2e71bac40d2de076fa9b1b406960 (diff) | |
| download | frameworks_base-164c2edccd7e27ff9d34fb81f5019088a31d2b56.zip frameworks_base-164c2edccd7e27ff9d34fb81f5019088a31d2b56.tar.gz frameworks_base-164c2edccd7e27ff9d34fb81f5019088a31d2b56.tar.bz2 | |
Fix NPE in ActivityManagerService
Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
| -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; } |