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

Commit 139eec57 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge changes from topic "nullablecollection" into sc-dev am: 84199909 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13435123

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3522e2caf51bef99e141253383bf435d3ba3e96
parents dd8848f1 84199909

core/java/android/app/PendingIntent.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi.Client;

import android.annotation.TestApi;
@@ -1275,6 +1276,7 @@ public final class PendingIntent implements Parcelable { 
     * @param flags MATCH_* flags from {@link android.content.pm.PackageManager}.

     * @hide

     */

    @SuppressLint("NullableCollection")

    @RequiresPermission(permission.GET_INTENT_SENDER_INTENT)

    @SystemApi(client = Client.MODULE_LIBRARIES)

    @TestApi

core/java/android/app/assist/AssistStructure.java

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package android.app.assist; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.app.Activity;

import android.content.ComponentName;
@@ -1542,6 +1543,7 @@ public class AssistStructure implements Parcelable { 
         * {@link View#getOnReceiveContentMimeTypes()} for details.

         */

        @Nullable

        @SuppressLint("NullableCollection")

        public String[] getOnReceiveContentMimeTypes() {

            return mOnReceiveContentMimeTypes;

        }

core/java/android/app/search/Query.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android.app.search; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.os.Bundle;

import android.os.Parcel;
@@ -46,6 +47,7 @@ public final class Query implements Parcelable { 


    public Query(@NonNull String input,

            long timestamp,

            @SuppressLint("NullableCollection")

            @Nullable Bundle extras) {

        mInput = input;

        mTimestamp = timestamp;
@@ -69,6 +71,7 @@ public final class Query implements Parcelable { 
    }



    @Nullable

    @SuppressLint("NullableCollection")

    public Bundle getExtras() {

        return mExtras;

    }

core/java/android/app/search/SearchAction.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.search; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.app.PendingIntent;

import android.content.Intent;
@@ -167,6 +168,7 @@ public final class SearchAction implements Parcelable { 
    /**

     * Returns the extra bundle for this object.

     */

    @SuppressLint("NullableCollection")

    public @Nullable Bundle getExtras() {

        return mExtras;

    }
@@ -325,7 +327,8 @@ public final class SearchAction implements Parcelable { 
         * Sets the extra.

         */

        @NonNull

        public SearchAction.Builder setExtras(@Nullable Bundle extras) {

        public SearchAction.Builder setExtras(

                @SuppressLint("NullableCollection") @Nullable Bundle extras) {

            mExtras = extras;

            return this;

        }

core/java/android/app/search/SearchContext.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package android.app.search; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.os.Bundle;

import android.os.Parcel;
@@ -52,7 +53,7 @@ public final class SearchContext implements Parcelable { 


    public SearchContext(int resultTypes,

            int queryTimeoutMillis,

            @Nullable Bundle extras) {

            @SuppressLint("NullableCollection") @Nullable Bundle extras) {

        mResultTypes = resultTypes;

        mTimeoutMillis = queryTimeoutMillis;

        mExtras = extras;
@@ -83,6 +84,7 @@ public final class SearchContext implements Parcelable { 
    }



    @Nullable

    @SuppressLint("NullableCollection")

    public Bundle getExtras() {

        return mExtras;

    }