Upstream version 6.35.131.0

[platform/framework/web/crosswalk.git] / src / base / android / java / src / org / chromium / base / ApplicationStatus.java

diff --git a/src/base/android/java/src/org/chromium/base/ApplicationStatus.java b/src/base/android/java/src/org/chromium/base/ApplicationStatus.java
index e055585..b4b79f1 100644 (file)
--- a/src/base/android/java/src/org/chromium/base/ApplicationStatus.java
+++ b/src/base/android/java/src/org/chromium/base/ApplicationStatus.java
@@ -190,6 +190,9 @@ public class ApplicationStatus {
         sCachedApplicationState = null;
 
         ActivityInfo info = sActivityInfo.get(activity);
+        // Ignore status from none tracked activitys.
+        if (info == null) return;
+
         info.setStatus(newState);
 
         // Notify all state observers that are specifically listening to this activity.