Merge "Idle timebase" into mnc-dev

[android-x86/frameworks-base.git] / services / core / java / com / android / server / am / ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d4172af..d035c92 100644 (file)
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -19956,7 +19956,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         public ComponentName getHomeActivityForUser(int userId) {
             synchronized (ActivityManagerService.this) {
                 ActivityRecord homeActivity = mStackSupervisor.getHomeActivityForUser(userId);
-                return homeActivity.realActivity;
+                return homeActivity == null ? null : homeActivity.realActivity;
             }
         }
     }