Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf751cd authored by Todd Kennedy's avatar Todd Kennedy Committed by Android (Google) Code Review
Browse files

Merge "fix nullability" into qt-dev

parents 4c648a02 7ea2e485

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11607,7 +11607,7 @@ package android.content.pm { 
    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int);

    method @NonNull public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, int);

    method @NonNull public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(@NonNull String, int);

    method @Nullable public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int);

    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int);

    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int);

    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int);

    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int);

core/java/android/content/pm/PackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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);