Merge "Fix LauncherAppsService queryIntentLauncherActivities"

1 files changed, 11 insertions, 3 deletions

diff --git a/core/java/android/content/pm/LauncherActivityInfoInternal.java b/core/java/android/content/pm/LauncherActivityInfoInternal.java
index 22e9712ebe3b..839b1761aadf 100644
--- a/core/java/android/content/pm/LauncherActivityInfoInternal.java
+++ b/core/java/android/content/pm/LauncherActivityInfoInternal.java
@@ -16,6 +16,8 @@
 
 package android.content.pm;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.os.Parcel;
@@ -28,17 +30,23 @@ public class LauncherActivityInfoInternal implements Parcelable {
     @UnsupportedAppUsage
     private ActivityInfo mActivityInfo;
     private ComponentName mComponentName;
-    private IncrementalStatesInfo mIncrementalStatesInfo;
+    @NonNull private IncrementalStatesInfo mIncrementalStatesInfo;
 
     /**
      * @param info ActivityInfo from which to create the LauncherActivityInfo.
      * @param incrementalStatesInfo The package's states.
      */
     public LauncherActivityInfoInternal(ActivityInfo info,
-            IncrementalStatesInfo incrementalStatesInfo) {
+            @Nullable IncrementalStatesInfo incrementalStatesInfo) {
         mActivityInfo = info;
         mComponentName = new ComponentName(info.packageName, info.name);
-        mIncrementalStatesInfo = incrementalStatesInfo;
+        if (incrementalStatesInfo == null) {
+            // default value for non-incremental apps
+            mIncrementalStatesInfo = new IncrementalStatesInfo(
+                    true /* isStartable */, false /* isLoading */, 1 /* progress */);
+        } else {
+            mIncrementalStatesInfo = incrementalStatesInfo;
+        }
     }
 
     public LauncherActivityInfoInternal(Parcel source) {