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

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

Revert "Nullability Annotations replacement" 

This reverts commit cf0501e4.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
parent cf0501e4

src/com/android/settings/RemoteBugreportActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 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;
@@ -28,7 +29,6 @@ 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

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


package com.android.settings;



import android.annotation.Nullable;

import android.app.Activity;

import android.app.settings.SettingsEnums;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.os.Bundle;

import android.provider.Settings;
@@ -41,7 +43,6 @@ 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.settings.core.InstrumentedFragment;

src/com/android/settings/TouchBlockingFrameLayout.java

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


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,6 +15,7 @@ 
 */

package com.android.settings;



import android.annotation.NonNull;

import android.app.Activity;

import android.app.admin.DevicePolicyManager;

import android.content.DialogInterface;
@@ -30,7 +31,6 @@ 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,6 +17,7 @@ 
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;
@@ -42,7 +43,6 @@ 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;