Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in ActivityManagerService

Browse Source 
Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
This commit is contained in:
Adam Skory
2013-08-13 13:32:31 -07:00
parent 6311399403
commit 164c2edccd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;
}