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

Commit 42fa58b8 authored by Leonarda Pribanić's avatar Leonarda Pribanić Committed by Android (Google) Code Review
Browse files

Merge "Annotate ActivityStarter as @NonNull" into main

parents e577e042 51fe7574

packages/SettingsLib/src/com/android/settingslib/users/CreateUserDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public class CreateUserDialogController { 
     * admin status.

     */

    public Dialog createDialog(Activity activity,

            ActivityStarter activityStarter, boolean canCreateAdminUser,

            @NonNull ActivityStarter activityStarter, boolean canCreateAdminUser,

            NewUserData successCallback, Runnable cancelCallback) {

        mActivity = activity;

        mCustomDialogHelper = new CustomDialogHelper(activity);

packages/SettingsLib/src/com/android/settingslib/users/EditUserInfoController.java

+6 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.WindowManager; 
import android.widget.EditText;

import android.widget.ImageView;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;
@@ -126,9 +127,11 @@ public class EditUserInfoController { 
     * @param activityStarter - ActivityStarter is called with appropriate intents and request

     *                        codes to take photo/choose photo/crop photo.

     */

    public Dialog createDialog(Activity activity, ActivityStarter activityStarter,

            @Nullable Drawable oldUserIcon, String defaultUserName,

            BiConsumer<String, Drawable> successCallback, Runnable cancelCallback) {

    public @NonNull Dialog createDialog(@NonNull Activity activity,

            @NonNull ActivityStarter activityStarter, @Nullable Drawable oldUserIcon,

            @Nullable String defaultUserName,

            @Nullable BiConsumer<String, Drawable> successCallback,

            @Nullable Runnable cancelCallback) {

        LayoutInflater inflater = LayoutInflater.from(activity);

        View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);

packages/SystemUI/tests/src/com/android/systemui/user/CreateUserActivityTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ class CreateUserActivityTest : SysuiTestCase() { 
                val dialog: Dialog = mock()

                whenever(

                        createDialog(

                            /* activity = */ nullable(),

                            /* activityStarter = */ nullable(),

                            /* activity = */ any(),

                            /* activityStarter = */ any(),

                            /* isMultipleAdminsEnabled = */ any(),

                            /* successCallback = */ nullable(),

                            /* cancelCallback = */ nullable()