Merge "fix nullability" into qt-dev

2019-04-05 14:16:37 +00:00
parent 4c648a027f 7ea2e485fe
commit 6cf751cda5
2 changed files with 3 additions and 3 deletions
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -4423,7 +4423,7 @@ public abstract class PackageManager {
     *         {@link #resolveActivity}. If there are no matching activities, an
     *         empty list is returned.
     */
-    @Nullable
+    @NonNull
    public abstract List<ResolveInfo> queryIntentActivities(@NonNull Intent intent,
            @ResolveInfoFlags int flags);

@@ -4444,7 +4444,7 @@ public abstract class PackageManager {
     *         empty list is returned.
     * @hide
     */
-    @Nullable
+    @NonNull
    @UnsupportedAppUsage
    public abstract List<ResolveInfo> queryIntentActivitiesAsUser(@NonNull Intent intent,
            @ResolveInfoFlags int flags, @UserIdInt int userId);