summaryrefslogtreecommitdiff
path: root/wifi
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2023-10-17 16:32:08 +0000
committerAndrew Sapperstein <asapperstein@google.com>2023-10-18 21:07:12 +0000
commit5c65ca5c8ca8e31e6c01ba104468fa9c6c970aba (patch)
tree378baf2a4adefe2a8a23050f55214a8f3f3603d1 /wifi
parent303e2ced8995fa9a3b5e8abc3fd699075c9a94fd (diff)
downloadbase-5c65ca5c8ca8e31e6c01ba104468fa9c6c970aba.tar.gz
Flag new SharedConnectivity APIs added post-U.
isBatteryCharging/setBatteryCharging and getBroadcastReceiver() were added post-U. Fixes: 305067231 Test: atest -c CtsWifiTestCases Change-Id: I6dbc979ab4a5711799208f6e56c5627296b1d5aa
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java3
-rw-r--r--wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java2
2 files changed, 5 insertions, 0 deletions
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
index 01f15916f244..3d5a0f7a239f 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
@@ -16,6 +16,7 @@
package android.net.wifi.sharedconnectivity.app;
+import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
@@ -169,6 +170,7 @@ public final class NetworkProviderInfo implements Parcelable {
* @return Returns the Builder object.
*/
@NonNull
+ @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status")
public Builder setBatteryCharging(boolean isBatteryCharging) {
mIsBatteryCharging = isBatteryCharging;
return this;
@@ -283,6 +285,7 @@ public final class NetworkProviderInfo implements Parcelable {
*
* @return Returns true if the battery of the remote device is charging.
*/
+ @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status")
public boolean isBatteryCharging() {
return mIsBatteryCharging;
}
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
index 71ac94ba2ee4..b0f68f7870ee 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
@@ -17,6 +17,7 @@
package android.net.wifi.sharedconnectivity.app;
import android.annotation.CallbackExecutor;
+import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -296,6 +297,7 @@ public class SharedConnectivityManager {
*/
@TestApi
@NonNull
+ @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api")
public BroadcastReceiver getBroadcastReceiver() {
return mBroadcastReceiver;
}