Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0da3bd1a authored by Gurpreet Singh's avatar Gurpreet Singh Committed by Android (Google) Code Review
Browse files

Merge "Update the src to use newly added feature flag instead." into main

parents 552c1bdf 996af8a5

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);

wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }