Revert "Nullability Annotations replacement"

This reverts commit cf0501e4d7.

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

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553

src/com/android/settings/RemoteBugreportActivity.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;

src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java

@@ -21,7 +21,8 @@ import static android.provider.Settings.System.KEYBOARD_VIBRATION_ENABLED;
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 
-
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.net.Uri;
@@ -32,8 +33,6 @@ import android.os.vibrator.Flags;
 import android.provider.Settings;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.Preference;

src/com/android/settings/applications/AppLocaleUtil.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.annotation.NonNull;
 import android.app.LocaleConfig;
 import android.content.Context;
 import android.content.Intent;
@@ -27,7 +28,6 @@ import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;

src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java

@@ -16,15 +16,13 @@
 
 package com.android.settings.applications;
 
-
+import android.annotation.NonNull;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.UserHandle;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
 import com.android.internal.util.Preconditions;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;

src/com/android/settings/applications/appops/BackgroundCheckSummary.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.appops;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
 import android.preference.PreferenceFrameLayout;
@@ -23,7 +24,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.android.settings.R;

src/com/android/settings/applications/credentials/CombinedProviderInfo.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.credentials;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -26,9 +28,6 @@ import android.service.autofill.AutofillServiceInfo;
 import android.text.TextUtils;
 import android.util.IconDrawableFactory;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;

src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java

@@ -18,6 +18,8 @@ package com.android.settings.applications.credentials;
 
 import static androidx.lifecycle.Lifecycle.Event.ON_CREATE;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.ComponentName;
@@ -47,8 +49,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.CompoundButton;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;

src/com/android/settings/applications/credentials/DefaultCombinedPicker.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.credentials;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -37,7 +38,6 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 

src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.credentials;
 
+import android.annotation.Nullable;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +30,6 @@ import android.service.autofill.AutofillServiceInfo;
 import android.text.TextUtils;
 import android.view.autofill.AutofillManager;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java

@@ -18,6 +18,7 @@ package com.android.settings.applications.defaultapps;
 
 import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -27,7 +28,6 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.R;

src/com/android/settings/applications/defaultapps/SettingIntentProvider.java

@@ -16,10 +16,9 @@
 
 package com.android.settings.applications.defaultapps;
 
+import android.annotation.Nullable;
 import android.content.Intent;
 
-import androidx.annotation.Nullable;
-
 /**
  * Provides an "advanced setting" intent for this app info.
  */

src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettings.java

@@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess.interactacrossprofiles;
 
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -31,7 +32,6 @@ import android.util.IconDrawableFactory;
 import android.util.Pair;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceClickListener;
 import androidx.preference.PreferenceScreen;

src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java

@@ -17,6 +17,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture;
 
 import static android.content.pm.PackageManager.GET_ACTIVITIES;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -31,7 +32,6 @@ import android.util.IconDrawableFactory;
 import android.util.Pair;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceClickListener;

src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.applications.specialaccess.premiumsms;
 
+import android.annotation.Nullable;
 import android.app.Application;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -23,7 +24,6 @@ import android.os.Bundle;
 import android.telephony.SmsManager;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.DropDownPreference;
 import androidx.preference.Preference;

src/com/android/settings/biometrics/BiometricEnrollActivity.java

@@ -24,6 +24,7 @@ import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT
 
 import static com.google.android.setupdesign.transition.TransitionHelper.TRANSITION_FADE_THROUGH;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
@@ -44,7 +45,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.internal.util.FrameworkStatsLog;

src/com/android/settings/biometrics/BiometricEnrollBase.java

@@ -18,6 +18,7 @@ package com.android.settings.biometrics;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.Nullable;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -31,7 +32,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
 
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;

src/com/android/settings/biometrics/BiometricEnrollSidecar.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.biometrics;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -23,8 +24,6 @@ import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.UserHandle;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 

src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java

@@ -16,12 +16,11 @@
 
 package com.android.settings.biometrics;
 
+import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.UserHandle;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 /**

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

@@ -21,6 +21,8 @@ import static android.text.Layout.HYPHENATION_FREQUENCY_NONE;
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
 import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.RawRes;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -58,8 +60,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.internal.annotations.VisibleForTesting;

src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java

@@ -20,6 +20,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.annotation.ColorInt;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -28,8 +29,6 @@ import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.R;
 import com.android.settings.Utils;
 

src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java

@@ -16,14 +16,13 @@
 
 package com.android.settings.biometrics.fingerprint;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.core.InstrumentedFragment;
 
 import java.util.LinkedList;

src/com/android/settings/biometrics/fingerprint/MessageDisplayController.java

@@ -16,12 +16,11 @@
 
 package com.android.settings.biometrics.fingerprint;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Handler;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.time.Clock;
 import java.util.ArrayDeque;
 import java.util.Deque;

src/com/android/settings/biometrics/fingerprint/UdfpsEnrollHelper.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.biometrics.fingerprint;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.PointF;
 import android.hardware.fingerprint.FingerprintManager;
@@ -27,9 +29,6 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.accessibility.AccessibilityManager;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.android.settings.core.InstrumentedFragment;
 
 import java.util.ArrayList;

src/com/android/settings/bluetooth/BluetoothPairingDialog.java

@@ -16,8 +16,7 @@
 
 package com.android.settings.bluetooth;
 
-import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+import android.annotation.Nullable;
-
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,10 +24,11 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.FragmentActivity;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 /**
  * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
  * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.

src/com/android/settings/bluetooth/LocalBluetoothPreferences.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -25,8 +26,6 @@ import android.content.res.Configuration;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**

src/com/android/settings/bluetooth/RequestPermissionActivity.java

@@ -18,6 +18,7 @@ package com.android.settings.bluetooth;
 
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -36,7 +37,6 @@ import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java

@@ -286,7 +286,7 @@ public class AudioSharingDeviceVolumeGroupController extends AudioSharingBasePre
 
             @Override
             public void onDeviceVolumeChanged(
-                    @NonNull BluetoothDevice device,
+                    @android.annotation.NonNull BluetoothDevice device,
                     @IntRange(from = -255, to = 255) int volume) {
                 CachedBluetoothDevice cachedDevice =
                         mLocalBtManager.getCachedDeviceManager().findDevice(device);

src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.connecteddevice.audiosharing;
 
+import android.annotation.Nullable;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java

@@ -16,13 +16,12 @@
 
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
+import android.annotation.Nullable;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
 import com.android.settingslib.bluetooth.BluetoothCallback;

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.connecteddevice.audiosharing.audiostreams;
 
+import android.annotation.Nullable;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.android.settings.bluetooth.Utils;

src/com/android/settings/connecteddevice/dock/DockUpdater.java

@@ -15,10 +15,9 @@
  */
 package com.android.settings.connecteddevice.dock;
 
+import android.annotation.NonNull;
 import android.content.Context;
 
-import androidx.annotation.NonNull;
-
 /**
  * Update the dock devices. It notifies the upper level whether to add/remove the preference
  * through {@link DevicePreferenceCallback}

src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java

@@ -16,10 +16,9 @@
 
 package com.android.settings.connecteddevice.fastpair;
 
+import android.annotation.Nullable;
 import android.content.Context;
 
-import androidx.annotation.Nullable;
-
 /**
  * Updates the Fast Pair devices. It notifies the upper level whether to add/remove the preference
  * through {@link DevicePreferenceCallback}

src/com/android/settings/connecteddevice/usb/UsbBackend.java

@@ -22,6 +22,7 @@ import static android.service.usb.UsbPortStatusProto.DATA_ROLE_HOST;
 import static android.service.usb.UsbPortStatusProto.DATA_ROLE_NONE;
 import static android.service.usb.UsbPortStatusProto.POWER_ROLE_SINK;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.usb.UsbManager;
@@ -31,7 +32,6 @@ import android.net.TetheringManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import java.util.List;

src/com/android/settings/core/CategoryMixin.java

@@ -19,6 +19,7 @@ package com.android.settings.core;
 import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
 
+import android.annotation.Nullable;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -29,7 +30,6 @@ import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;

src/com/android/settings/core/PreferenceControllerListHelper.java

@@ -20,14 +20,13 @@ import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTRO
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_FOR_WORK;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
 
+import android.annotation.NonNull;
 import android.annotation.XmlRes;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
 import com.android.settingslib.core.AbstractPreferenceController;
 

src/com/android/settings/core/PreferenceXmlParserUtils.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.core;
 
+import android.annotation.NonNull;
 import android.annotation.XmlRes;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -27,7 +28,6 @@ import android.util.Log;
 import android.util.Xml;
 
 import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
 
 import com.android.settings.R;
 

src/com/android/settings/datausage/MeasurableLinearLayout.java

@@ -1,12 +1,11 @@
 package com.android.settings.datausage;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import androidx.annotation.Nullable;
-
 public class MeasurableLinearLayout extends LinearLayout {
     private View mFixedView;
     private View mDisposableView;

src/com/android/settings/datausage/SpinnerPreference.java

@@ -14,13 +14,13 @@
 
 package com.android.settings.datausage;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Spinner;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 

src/com/android/settings/development/BackAnimationPreferenceController.java

@@ -18,10 +18,10 @@ package com.android.settings.development;
 
 import static com.android.window.flags.Flags.predictiveBackSystemAnimations;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.provider.Settings;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.TwoStatePreference;
 

src/com/android/settings/development/EnableVerboseVendorLoggingPreferenceController.java

@@ -16,13 +16,13 @@
 
 package com.android.settings.development;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.hardware.dumpstate.V1_0.IDumpstateDevice;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.TwoStatePreference;

src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 package com.android.settings.development.graphicsdriver;
-
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.os.SystemProperties;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 /**
  * Wrapper interface to access {@link SystemProperties}.
  *

src/com/android/settings/development/tare/AlarmManagerFragment.java

@@ -15,6 +15,7 @@
  */
 package com.android.settings.development.tare;
 
+import android.annotation.Nullable;
 import android.app.Fragment;
 import android.app.tare.EconomyManager;
 import android.content.res.Resources;
@@ -25,8 +26,6 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.R;
 
 /**

src/com/android/settings/development/tare/JobSchedulerFragment.java

@@ -15,6 +15,7 @@
  */
 package com.android.settings.development.tare;
 
+import android.annotation.Nullable;
 import android.app.Fragment;
 import android.app.tare.EconomyManager;
 import android.content.res.Resources;
@@ -25,8 +26,6 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.R;
 
 /**

src/com/android/settings/development/tare/TareFactorController.java

@@ -25,6 +25,7 @@ import static android.app.tare.EconomyManager.parseCreditValue;
 import static android.provider.Settings.Global.TARE_ALARM_MANAGER_CONSTANTS;
 import static android.provider.Settings.Global.TARE_JOB_SCHEDULER_CONSTANTS;
 
+import android.annotation.NonNull;
 import android.app.tare.EconomyManager;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -39,8 +40,6 @@ import android.util.ArraySet;
 import android.util.KeyValueListParser;
 import android.util.Slog;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.R;
 
 /**

src/com/android/settings/development/tare/TareFactorDialogFragment.java

@@ -18,6 +18,7 @@ package com.android.settings.development.tare;
 
 import static android.app.tare.EconomyManager.CAKE_IN_ARC;
 
+import android.annotation.NonNull;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -32,8 +33,6 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.R;
 import com.android.settings.Utils;
 

src/com/android/settings/development/tare/TareFactorExpandableListAdapter.java

@@ -18,6 +18,7 @@ package com.android.settings.development.tare;
 
 import static android.app.tare.EconomyManager.CAKE_IN_ARC;
 
+import android.annotation.NonNull;
 import android.annotation.SuppressLint;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,8 +26,6 @@ import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.R;
 
 /**

src/com/android/settings/deviceinfo/StorageWizardBase.java

@@ -20,6 +20,7 @@ import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
 import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID;
 
 import android.annotation.LayoutRes;
+import android.annotation.NonNull;
 import android.content.Intent;
 import android.content.res.Resources.Theme;
 import android.graphics.drawable.Drawable;
@@ -37,7 +38,6 @@ import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

@@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.simstatus;
 
 import static androidx.lifecycle.Lifecycle.Event;
 
+import android.annotation.Nullable;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -53,7 +54,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;

src/com/android/settings/deviceinfo/storage/StorageEntry.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.deviceinfo.storage;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -25,8 +26,6 @@ import android.os.storage.VolumeInfo;
 import android.os.storage.VolumeRecord;
 import android.text.TextUtils;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.R;
 
 import java.io.File;

src/com/android/settings/display/ScreenResolutionFragment.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.display;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.res.Resources;
@@ -29,7 +30,6 @@ import android.view.Display;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

@@ -18,6 +18,7 @@ package com.android.settings.enterprise;
 
 import static android.app.admin.DevicePolicyResources.Strings.Settings.DISABLED_BY_IT_ADMIN_TITLE;
 
+import android.annotation.NonNull;
 import android.annotation.UserIdInt;
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
@@ -32,7 +33,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 

src/com/android/settings/fuelgauge/BatteryActiveView.java

@@ -14,6 +14,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -21,8 +22,6 @@ import android.util.AttributeSet;
 import android.util.SparseIntArray;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 public class BatteryActiveView extends View {
 
     private final Paint mPaint = new Paint();

src/com/android/settings/fuelgauge/BatteryMeterView.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.fuelgauge;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.ColorFilter;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;

src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java

@@ -16,13 +16,13 @@
 
 package com.android.settings.fuelgauge.batterytip;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.os.BadParcelableException;
 import android.os.Bundle;
 import android.util.ArrayMap;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;

src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java

@@ -16,6 +16,7 @@
 package com.android.settings.fuelgauge.batteryusage;
 
 import android.annotation.IntDef;
+import android.annotation.Nullable;
 import android.app.usage.IUsageStatsManager;
 import android.app.usage.UsageEvents.Event;
 import android.app.usage.UsageStatsManager;
@@ -33,7 +34,6 @@ import android.util.Base64;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.fuelgauge.BatteryUtils;

src/com/android/settings/gestures/BackGestureIndicatorDrawable.java

@@ -18,6 +18,8 @@ package com.android.settings.gestures;
 
 import android.animation.TimeAnimator;
 import android.annotation.IntRange;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -28,9 +30,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 

src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java

@@ -16,10 +16,10 @@
 
 package com.android.settings.homepage.contextualcards;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.collection.ArraySet;
 import androidx.lifecycle.LifecycleOwner;
 

src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java

@@ -16,7 +16,7 @@
 
 package com.android.settings.homepage.contextualcards;
 
-import androidx.annotation.Nullable;
+import android.annotation.Nullable;
 
 import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
 import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;

src/com/android/settings/inputmethod/UserDictionarySettings.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import android.annotation.Nullable;
 import android.app.ActionBar;
 import android.app.settings.SettingsEnums;
 import android.content.ContentResolver;
@@ -38,7 +39,6 @@ import android.widget.SectionIndexer;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.ListFragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;

src/com/android/settings/network/ActiveSubscriptionsListener.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.network;
 
+import android.annotation.NonNull;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +30,6 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.telephony.TelephonyIntents;

src/com/android/settings/network/CarrierConfigCache.java

@@ -20,6 +20,7 @@ import static android.telephony.CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANG
 import static android.telephony.SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX;
 import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
+import android.annotation.NonNull;
 import android.annotation.TestApi;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -31,7 +32,6 @@ import android.telephony.SubscriptionManager;
 import android.util.Log;
 
 import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import java.util.Map;

src/com/android/settings/network/InternetUpdater.java

@@ -24,6 +24,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
 import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
 
+import android.annotation.NonNull;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -36,7 +37,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;

src/com/android/settings/network/MobileNetworkRepository.java

@@ -18,6 +18,7 @@ package com.android.settings.network;
 import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING;
 import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
 
+import android.annotation.NonNull;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -37,7 +38,6 @@ import android.util.IndentingPrintWriter;
 import android.util.Log;
 
 import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.android.internal.telephony.flags.Flags;

src/com/android/settings/network/ProxySubscriptionManager.java

@@ -20,6 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.os.Looper;
 import android.provider.Settings;
@@ -28,7 +29,6 @@ import android.telephony.SubscriptionManager;
 import android.util.Log;
 
 import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;

src/com/android/settings/network/SubscriptionUtil.java

@@ -22,6 +22,7 @@ import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING;
 
 import static com.android.internal.util.CollectionUtils.emptyIfNull;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.ParcelUuid;
@@ -38,7 +39,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.telephony.MccTable;

src/com/android/settings/network/telephony/MobileNetworkUtils.java

@@ -31,6 +31,7 @@ import static com.android.settings.network.telephony.TelephonyConstants.Telephon
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
 
+import android.annotation.Nullable;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -68,7 +69,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.util.ArrayUtils;

src/com/android/settings/notification/AppBubbleListPreferenceController.java

@@ -21,6 +21,7 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL;
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED;
 
+import android.annotation.Nullable;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.content.Context;
@@ -30,7 +31,6 @@ import android.service.notification.ConversationChannelWrapper;
 import android.view.View;
 import android.widget.ImageView;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

@@ -24,6 +24,7 @@ import static com.android.internal.notification.NotificationAccessConfirmationAc
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID;
 
 import android.Manifest;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
@@ -43,8 +44,6 @@ import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
-
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;

src/com/android/settings/notification/NotificationAccessSettings.java

@@ -19,6 +19,7 @@ package com.android.settings.notification;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED;
 
+import android.annotation.Nullable;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
@@ -39,7 +40,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/notification/app/BubblePreferenceController.java

@@ -19,11 +19,11 @@ package com.android.settings.notification.app;
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
 import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
 
+import android.annotation.Nullable;
 import android.app.NotificationChannel;
 import android.content.Context;
 import android.provider.Settings;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 

src/com/android/settings/notification/app/NotificationPreferenceController.java

@@ -17,18 +17,21 @@
 package com.android.settings.notification.app;
 
 import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.os.UserHandle.USER_SYSTEM;
 
+import android.annotation.Nullable;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Drawable;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.notification.NotificationBackend;

src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java

@@ -2,13 +2,13 @@ package com.android.settings.notification.history;
 
 import static android.view.HapticFeedbackConstants.CLOCK_TICK;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;

src/com/android/settings/notification/zen/ZenAccessSettings.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.notification.zen;
 
+import android.annotation.Nullable;
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -29,7 +30,6 @@ import android.util.ArraySet;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;

src/com/android/settings/password/ChooseLockSettingsHelper.java

@@ -18,6 +18,8 @@ package com.android.settings.password;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.app.KeyguardManager;
@@ -31,8 +33,6 @@ import android.os.UserManager;
 import android.util.Log;
 
 import androidx.activity.result.ActivityResultLauncher;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 

src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java

@@ -22,6 +22,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.Nullable;
 import android.app.Dialog;
 import android.app.KeyguardManager;
 import android.app.RemoteLockscreenValidationSession;
@@ -47,7 +48,6 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;

src/com/android/settings/password/ConfirmLockPassword.java

@@ -26,6 +26,7 @@ import static com.android.settings.biometrics.GatekeeperPasswordProvider.contain
 import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE;
 
+import android.annotation.Nullable;
 import android.app.KeyguardManager;
 import android.app.RemoteLockscreenValidationResult;
 import android.app.admin.DevicePolicyManager;
@@ -56,7 +57,6 @@ import android.widget.ImeAwareEditText;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.android.internal.widget.LockPatternChecker;

src/com/android/settings/password/ConfirmLockPattern.java

@@ -24,6 +24,7 @@ import static com.android.settings.biometrics.GatekeeperPasswordProvider.contain
 import static com.android.settings.biometrics.GatekeeperPasswordProvider.getGatekeeperPasswordHandle;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE;
 
+import android.annotation.Nullable;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.KeyguardManager;
@@ -45,8 +46,6 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;

src/com/android/settings/password/PasswordRequirementAdapter.java

@@ -16,13 +16,13 @@
 
 package com.android.settings.password;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;

src/com/android/settings/password/PasswordUtils.java

@@ -18,6 +18,7 @@ package com.android.settings.password;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.IActivityManager;
 import android.content.Context;
@@ -32,8 +33,6 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.R;
 import com.android.settings.Utils;
 

src/com/android/settings/password/SetNewPasswordController.java

@@ -22,6 +22,7 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT
 
 import static com.android.internal.util.Preconditions.checkNotNull;
 
+import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -33,7 +34,6 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.UserManager;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.Utils;

src/com/android/settings/print/SettingsPrintServicesLoader.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.print;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.print.PrintManager;
 import android.print.PrintServicesLoader;
 import android.printservice.PrintServiceInfo;
 
-import androidx.annotation.NonNull;
 import androidx.loader.content.Loader;
 
 import com.android.internal.util.Preconditions;

src/com/android/settings/privacy/EnableContentCapturePreferenceController.java

@@ -16,12 +16,11 @@
 
 package com.android.settings.privacy;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.utils.ContentCaptureUtils;

src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.privacy;
 
+import android.annotation.NonNull;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -25,7 +26,6 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 
 import com.android.settings.R;

src/com/android/settings/privacy/PrivacyHubPreferenceController.java

@@ -16,11 +16,10 @@
 
 package com.android.settings.privacy;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.provider.DeviceConfig;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.core.BasePreferenceController;
 
 /**

src/com/android/settings/privacy/TopLevelPrivacyEntryPreferenceController.java

@@ -16,10 +16,9 @@
 
 package com.android.settings.privacy;
 
+import android.annotation.NonNull;
 import android.content.Context;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
 

src/com/android/settings/search/SearchFeatureProvider.java

@@ -18,6 +18,7 @@ package com.android.settings.search;
 
 import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
 
+import android.annotation.NonNull;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Context;
@@ -29,7 +30,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toolbar;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;

src/com/android/settings/search/actionbar/SearchMenuController.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.search.actionbar;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
@@ -25,7 +26,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;

src/com/android/settings/security/InstallCaCertificateWarning.java

@@ -18,6 +18,7 @@ package com.android.settings.security;
 
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,8 +26,6 @@ import android.security.Credentials;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.Nullable;
-
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 

src/com/android/settings/security/RequestManageCredentials.java

@@ -18,6 +18,7 @@ package com.android.settings.security;
 
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.admin.DevicePolicyEventLogger;
 import android.app.admin.DevicePolicyManager;
@@ -46,7 +47,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

src/com/android/settings/slices/SliceBackgroundWorker.java

@@ -17,6 +17,7 @@
 package com.android.settings.slices;
 
 import android.annotation.MainThread;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Handler;
@@ -28,7 +29,6 @@ import android.os.SystemClock;
 import android.util.ArrayMap;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import java.io.Closeable;

src/com/android/settings/sound/AudioSwitchPreferenceController.java

@@ -20,6 +20,7 @@ import static android.media.AudioManager.STREAM_DEVICES_CHANGED_ACTION;
 
 import static com.android.settingslib.media.flags.Flags.enableOutputSwitcherForSystemRouting;
 
+import android.annotation.Nullable;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -37,7 +38,6 @@ import android.os.Looper;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;

src/com/android/settings/sound/MediaOutputPreferenceController.java

@@ -18,6 +18,7 @@ package com.android.settings.sound;
 
 import static com.android.settingslib.media.flags.Flags.enableOutputSwitcherForSystemRouting;
 
+import android.annotation.Nullable;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
@@ -26,7 +27,6 @@ import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/support/actionbar/HelpMenuController.java

@@ -18,12 +18,12 @@ package com.android.settings.support.actionbar;
 
 import static com.android.settings.support.actionbar.HelpResourceProvider.HELP_URI_RESOURCE_KEY;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import com.android.settingslib.HelpUtils;

src/com/android/settings/utils/ContentCaptureUtils.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.utils;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.IBinder;
@@ -25,9 +27,6 @@ import android.provider.Settings;
 import android.util.Log;
 import android.view.contentcapture.ContentCaptureManager;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 public final class ContentCaptureUtils {
 
     private static final String TAG = ContentCaptureUtils.class.getSimpleName();

src/com/android/settings/utils/FileSizeFormatter.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.utils;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.icu.text.DecimalFormat;
 import android.icu.text.MeasureFormat;
@@ -26,9 +28,6 @@ import android.text.BidiFormatter;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.math.BigDecimal;
 import java.util.Locale;
 

src/com/android/settings/utils/ManagedServiceSettings.java

@@ -18,6 +18,7 @@ package com.android.settings.utils;
 
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED;
 
+import android.annotation.Nullable;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
@@ -33,7 +34,6 @@ import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceScreen;