diff options
| author | Adam Skory <skory@google.com> | 2013-08-13 22:30:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-13 22:30:51 +0000 |
| commit | 3890f8543aefa1fba843b49d9482da2ac6a5bdc9 (patch) | |
| tree | 42939281be4fe15dd622007bdab38381d767abe8 /services | |
| parent | 87fefc449bffabebf98020f40d21d28500b1c1bb (diff) | |
| parent | 164c2edccd7e27ff9d34fb81f5019088a31d2b56 (diff) | |
| download | frameworks_base-3890f8543aefa1fba843b49d9482da2ac6a5bdc9.zip frameworks_base-3890f8543aefa1fba843b49d9482da2ac6a5bdc9.tar.gz frameworks_base-3890f8543aefa1fba843b49d9482da2ac6a5bdc9.tar.bz2 | |
Merge "Fix NPE in ActivityManagerService" into klp-dev
Diffstat (limited to 'services')
| -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; } |