LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix typedef retention" into main

Browse Source
This commit is contained in:
Anton Hansson
2023-11-13 09:39:05 +00:00
committed by Gerrit Code Review
parent 8b61783b78 f5fa3c6c72
commit 4de53e2d18
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/QosSession.java
View File

@@ -22,6 +22,9 @@ import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/** /**
* Provides identifying information of a QoS session. Sent to an application through * Provides identifying information of a QoS session. Sent to an application through
* {@link QosCallback}. * {@link QosCallback}.
@@ -107,6 +110,7 @@ public final class QosSession implements Parcelable {
TYPE_EPS_BEARER, TYPE_EPS_BEARER,
TYPE_NR_BEARER, TYPE_NR_BEARER,
}) })
@Retention(RetentionPolicy.SOURCE)
@interface QosSessionType {} @interface QosSessionType {}
private QosSession(final Parcel in) { private QosSession(final Parcel in) {

1
nearby/framework/java/android/nearby/BroadcastRequest.java
View File

@@ -88,6 +88,7 @@ public abstract class BroadcastRequest {
* @hide * @hide
*/ */
@IntDef({MEDIUM_BLE}) @IntDef({MEDIUM_BLE})
@Retention(RetentionPolicy.SOURCE)
public @interface Medium {} public @interface Medium {}
/** /**

3
nearby/framework/java/android/nearby/NearbyDevice.java
View File

@@ -25,6 +25,8 @@ import android.util.ArraySet;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@@ -149,6 +151,7 @@ public abstract class NearbyDevice {
* @hide * @hide
*/ */
@IntDef({Medium.BLE, Medium.BLUETOOTH}) @IntDef({Medium.BLE, Medium.BLUETOOTH})
@Retention(RetentionPolicy.SOURCE)
public @interface Medium { public @interface Medium {
int BLE = 1; int BLE = 1;
int BLUETOOTH = 2; int BLUETOOTH = 2;

3
nearby/framework/java/android/nearby/NearbyManager.java
View File

@@ -34,6 +34,8 @@ import android.util.Log;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Objects; import java.util.Objects;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@@ -63,6 +65,7 @@ public class NearbyManager {
ScanStatus.SUCCESS, ScanStatus.SUCCESS,
ScanStatus.ERROR, ScanStatus.ERROR,
}) })
@Retention(RetentionPolicy.SOURCE)
public @interface ScanStatus { public @interface ScanStatus {
// The undetermined status, some modules may be initializing. Retry is suggested. // The undetermined status, some modules may be initializing. Retry is suggested.
int UNKNOWN = 0; int UNKNOWN = 0;