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

Commit 9f1d9ea3 authored by sunnyshao's avatar sunnyshao
Browse files

Nullability Annotations replacement 

-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Fixes: 316867690
Test: build pass
Change-Id: I2b13559344a9d8655deba46a1a7056de7ff6edca
parent 65736e84

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import static android.app.admin.DevicePolicyManager.PROFILE_KEYGUARD_FEATURES_AF 
import static com.android.settingslib.Utils.getColorAttrDefaultColor;



import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.AppGlobals;

import android.app.AppOpsManager;
@@ -52,6 +50,8 @@ import android.util.Log; 
import android.view.MenuItem;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.ENABLED_B 


import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.annotation.NonNull;

import android.app.AppOpsManager;

import android.app.admin.DevicePolicyManager;

import android.content.Context;
@@ -35,6 +34,7 @@ import android.widget.ImageView; 
import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceViewHolder;

packages/SettingsLib/src/com/android/settingslib/Utils.java

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package com.android.settingslib; 
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USER_LABEL;



import android.annotation.ColorInt;

import android.annotation.Nullable;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;
@@ -23,10 +22,10 @@ import android.graphics.ColorFilter; 
import android.graphics.ColorMatrix;

import android.graphics.ColorMatrixColorFilter;

import android.graphics.drawable.Drawable;

import android.hardware.usb.flags.Flags;

import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbPort;

import android.hardware.usb.UsbPortStatus;

import android.hardware.usb.flags.Flags;

import android.location.LocationManager;

import android.media.AudioManager;

import android.net.NetworkCapabilities;
@@ -47,6 +46,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;

import androidx.core.graphics.drawable.RoundedBitmapDrawable;

import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;

packages/SettingsLib/src/com/android/settingslib/applications/DefaultAppInfo.java

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



import android.app.AppGlobals;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -28,6 +27,8 @@ import android.graphics.drawable.Drawable; 
import android.os.RemoteException;

import android.util.IconDrawableFactory;



import androidx.annotation.Nullable;



import com.android.settingslib.widget.CandidateInfo;



/**

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ import static android.bluetooth.BluetoothAdapter.STATE_TURNING_OFF; 
import static android.bluetooth.BluetoothAdapter.STATE_TURNING_ON;



import android.annotation.IntDef;

import android.annotation.Nullable;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;