Merge "Revert "Nullability Annotations replacement"" into main

This commit is contained in:
Sunny Shao
2023-12-29 03:18:24 +00:00
committed by Android (Google) Code Review
130 changed files with 154 additions and 198 deletions

View File

@@ -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.internal.telephony.flags.Flags;