Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nullability Annotations replacement

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

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
This commit is contained in:
sunnyshao
2023-12-19 17:19:53 +08:00
parent 6ca4c0fb5a
commit cf0501e4d7
130 changed files with 198 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeGroupController.java
View File

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

2
src/com/android/settings/connecteddevice/audiosharing/CallsAndAlarmsPreferenceController.java
View File

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

3
src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
View File

@@ -16,12 +16,13 @@
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;

2
src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
View File

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

3
src/com/android/settings/connecteddevice/dock/DockUpdater.java
View File

@@ -15,9 +15,10 @@
*/
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}

3
src/com/android/settings/connecteddevice/fastpair/FastPairDeviceUpdater.java
View File

@@ -16,9 +16,10 @@
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}

2
src/com/android/settings/connecteddevice/usb/UsbBackend.java
View File

@@ -22,7 +22,6 @@ 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;
@@ -32,6 +31,7 @@ import android.net.TetheringManager;
import android.os.UserHandle;
import android.os.UserManager;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.util.List;