Merge "Add @UnsupportedAppUsage annotations" (a0aba8a6) · Commits · e / os / android_frameworks_base

config/hiddenapi-vendor-list.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -55,15 +55,6 @@ Landroid/app/TaskStackListener;->onTaskSnapshotChanged(ILandroid/app/ActivityMan
		Landroid/app/TaskStackListener;->onTaskStackChanged()V
		Landroid/app/WallpaperColors;-><init>(Landroid/graphics/Color;Landroid/graphics/Color;Landroid/graphics/Color;I)V
		Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V
		Landroid/companion/AssociationRequest;->getDeviceFilters()Ljava/util/List;
		Landroid/companion/AssociationRequest;->isSingleDevice()Z
		Landroid/companion/BluetoothDeviceFilter;->getAddress()Ljava/lang/String;
		Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String;
		Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/net/wifi/ScanResult;)Ljava/lang/String;
		Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceMacAddress(Landroid/os/Parcelable;)Ljava/lang/String;
		Landroid/companion/BluetoothLeDeviceFilter;->getScanFilter()Landroid/bluetooth/le/ScanFilter;
		Landroid/companion/DeviceFilter;->getDeviceDisplayName(Landroid/os/Parcelable;)Ljava/lang/String;
		Landroid/companion/DeviceFilter;->matches(Landroid/os/Parcelable;)Z
		Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V
		Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V
		Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V

core/java/android/companion/AssociationRequest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.companion;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.provider.OneTimeUseBuilder;
		@@ -59,12 +60,14 @@ public final class AssociationRequest implements Parcelable {
		}

		/** @hide */
		@UnsupportedAppUsage
		public boolean isSingleDevice() {
		return mSingleDevice;
		}

		/** @hide */
		@NonNull
		@UnsupportedAppUsage
		public List<DeviceFilter<?>> getDeviceFilters() {
		return mDeviceFilters;
		}

core/java/android/companion/BluetoothDeviceFilter.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static android.companion.BluetoothDeviceFilterUtils.patternToString;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.bluetooth.BluetoothDevice;
		import android.os.Parcel;
		import android.os.ParcelUuid;
		@@ -99,6 +100,7 @@ public final class BluetoothDeviceFilter implements DeviceFilter<BluetoothDevice

		/** @hide */
		@Nullable
		@UnsupportedAppUsage
		public String getAddress() {
		return mAddress;
		}

core/java/android/companion/BluetoothDeviceFilterUtils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.text.TextUtils.firstNotEmpty;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.le.ScanFilter;
		import android.net.wifi.ScanResult;
		@@ -124,14 +125,17 @@ public class BluetoothDeviceFilterUtils {
		Log.i(LOG_TAG, getDeviceDisplayNameInternal(device) + (result ? " ~ " : " !~ ") + criteria);
		}

		@UnsupportedAppUsage
		public static String getDeviceDisplayNameInternal(@NonNull BluetoothDevice device) {
		return firstNotEmpty(device.getAliasName(), device.getAddress());
		}

		@UnsupportedAppUsage
		public static String getDeviceDisplayNameInternal(@NonNull ScanResult device) {
		return firstNotEmpty(device.SSID, device.BSSID);
		}

		@UnsupportedAppUsage
		public static String getDeviceMacAddress(@NonNull Parcelable device) {
		if (device instanceof BluetoothDevice) {
		return ((BluetoothDevice) device).getAddress();

core/java/android/companion/BluetoothLeDeviceFilter.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static com.android.internal.util.Preconditions.checkState;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.le.ScanFilter;
		import android.bluetooth.le.ScanRecord;
		@@ -92,6 +93,7 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> {

		/** @hide */
		@NonNull
		@UnsupportedAppUsage
		public ScanFilter getScanFilter() {
		return mScanFilter;
		}