From 996af8a529884a18d38dbb58a0d91eed36149a43 Mon Sep 17 00:00:00 2001
From: Gurpreet Singh <gurpreetgs@google.com>
Date: Thu, 9 May 2024 15:49:37 +0000
Subject: [PATCH] Update the src to use newly added feature flag instead.
Replace the flag used in src to use newly added flag in ag/27264595.
Bug: 339181644
Test: lunch sdk-next-eng && croot && ./build/tools/check-flagged-apis/check-flagged-apis.sh
Change-Id: If4c75f91e95f7cbe0cd41aab7dbffcd21615182f
---
core/api/system-current.txt | 4 ++--
.../net/wifi/sharedconnectivity/app/NetworkProviderInfo.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index eabe1f1c271a..ba1bcc8852c9 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10342,7 +10342,7 @@ package android.net.wifi.sharedconnectivity.app {
method public int getDeviceType();
method @NonNull public android.os.Bundle getExtras();
method @NonNull public String getModelName();
- method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();
+ method @FlaggedApi("android.net.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.NetworkProviderInfo> CREATOR;
field public static final int DEVICE_TYPE_AUTO = 5; // 0x5
@@ -10356,7 +10356,7 @@ package android.net.wifi.sharedconnectivity.app {
public static final class NetworkProviderInfo.Builder {
ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();
- method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);
+ method @FlaggedApi("android.net.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=4) int);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);
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 3d5a0f7a239f..395f744ef043 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
@@ -21,6 +21,7 @@ import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.net.wifi.flags.Flags;
import android.net.wifi.sharedconnectivity.service.SharedConnectivityService;
import android.os.Bundle;
import android.os.Parcel;
@@ -170,7 +171,7 @@ public final class NetworkProviderInfo implements Parcelable {
* @return Returns the Builder object.
*/
@NonNull
- @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status")
+ @FlaggedApi(Flags.FLAG_NETWORK_PROVIDER_BATTERY_CHARGING_STATUS)
public Builder setBatteryCharging(boolean isBatteryCharging) {
mIsBatteryCharging = isBatteryCharging;
return this;
@@ -285,7 +286,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")
+ @FlaggedApi(Flags.FLAG_NETWORK_PROVIDER_BATTERY_CHARGING_STATUS)
public boolean isBatteryCharging() {
return mIsBatteryCharging;
}
--
GitLab