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

Commit bee65b41 authored by Sunny Shao's avatar Sunny Shao Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Nullability Annotations replacement"" into main

parents b6a6b1e9 076ed573

src/com/android/settings/RemoteBugreportActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REM 
import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REMOTE_BUGREPORT_NOT_FINISHED_REQUEST_CONSENT;

import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARING_REMOTE_BUGREPORT_MESSAGE;



import android.annotation.Nullable;

import android.app.Activity;

import android.app.admin.DevicePolicyManager;

import android.content.DialogInterface;
@@ -29,6 +28,7 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.util.Log;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;



/**

src/com/android/settings/ResetNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings;



import android.annotation.Nullable;

import android.app.Activity;

import android.app.settings.SettingsEnums;

import android.content.ContentResolver;
@@ -42,6 +41,7 @@ import android.widget.Spinner; 
import androidx.activity.result.ActivityResult;

import androidx.activity.result.ActivityResultLauncher;

import androidx.activity.result.contract.ActivityResultContracts;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.internal.telephony.flags.Flags;

src/com/android/settings/TouchBlockingFrameLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package com.android.settings;



import android.annotation.Nullable;

import android.content.Context;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.widget.FrameLayout;



import androidx.annotation.Nullable;



/**

 * Extension of FrameLayout that consumes all touch events.

 */

src/com/android/settings/TrustedCredentialsDialogBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.settings;



import android.annotation.NonNull;

import android.app.Activity;

import android.app.admin.DevicePolicyManager;

import android.content.DialogInterface;
@@ -31,6 +30,7 @@ import android.widget.Button; 
import android.widget.LinearLayout;

import android.widget.Spinner;



import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;



import com.android.internal.widget.LockPatternUtils;

src/com/android/settings/UserCredentialsSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings;



import android.annotation.LayoutRes;

import android.annotation.Nullable;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;
@@ -43,6 +42,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.TextView;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.DialogFragment;