Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7
.
Reason for revert: b/317462033, it seems a flaky but revert it first.
Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
This commit is contained in:
committed by
Android (Google) Code Review
parent
cf0501e4d7
commit
19d1d3d15d
@@ -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();
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user