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

Commit 12700b99 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Remove references to networkProviderBatteryChargingStatus flag 

The networkProviderBatteryChargingStatus flag has been flipped to true and
the code no longer needs to check it.
This change removes the code checks for the flag.

Bug: 409612054, 249151277
Test:  atest android.net.wifi.sharedconnectivity.cts.SharedConnectivityTest
android.net.wifi.sharedconnectivity.cts.app.HotspotNetworkConnectionStatusTest android.net.wifi.sharedconnectivity.cts.app.HotspotNetworkTest android.net.wifi.sharedconnectivity.cts.app.KnownNetworkConnectionStatusTest android.net.wifi.sharedconnectivity.cts.app.KnownNetworkTest android.net.wifi.sharedconnectivity.cts.app.NetworkProviderInfoTest android.net.wifi.sharedconnectivity.cts.app.SharedConnectivityManagerTest
Flag: com.android.wifi.flags.network_provider_battery_charging_status

Change-Id: I36d15963a30ea35c6bf3c769bf1cd1f69c9f744f
parent a9a3db0b

core/api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -10819,7 +10819,7 @@ package android.net.wifi.sharedconnectivity.app { 
    method public int getDeviceType();

    method public int getDeviceType();

    method @NonNull public android.os.Bundle getExtras();

    method @NonNull public android.os.Bundle getExtras();

    method @NonNull public String getModelName();

    method @NonNull public String getModelName();

    method @FlaggedApi("android.net.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();

    method public boolean isBatteryCharging();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    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 @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

    field public static final int DEVICE_TYPE_AUTO = 5; // 0x5
@@ -10833,7 +10833,7 @@ package android.net.wifi.sharedconnectivity.app { 
  public static final class NetworkProviderInfo.Builder {

  public static final class NetworkProviderInfo.Builder {

    ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);

    ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();

    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 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 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 setConnectionStrength(@IntRange(from=0, to=4) int);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.net.wifi.flags.Flags;

import android.net.wifi.sharedconnectivity.service.SharedConnectivityService;

import android.net.wifi.sharedconnectivity.service.SharedConnectivityService;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcel;
@@ -171,7 +170,6 @@ public final class NetworkProviderInfo implements Parcelable { 
         * @return Returns the Builder object.

         * @return Returns the Builder object.

         */

         */

        @NonNull

        @NonNull

        @FlaggedApi(Flags.FLAG_NETWORK_PROVIDER_BATTERY_CHARGING_STATUS)

        public Builder setBatteryCharging(boolean isBatteryCharging) {

        public Builder setBatteryCharging(boolean isBatteryCharging) {

            mIsBatteryCharging = isBatteryCharging;

            mIsBatteryCharging = isBatteryCharging;

            return this;

            return this;
@@ -286,7 +284,6 @@ public final class NetworkProviderInfo implements Parcelable { 
     *

     *

     * @return Returns true if the battery of the remote device is charging.

     * @return Returns true if the battery of the remote device is charging.

     */

     */

    @FlaggedApi(Flags.FLAG_NETWORK_PROVIDER_BATTERY_CHARGING_STATUS)

    public boolean isBatteryCharging() {

    public boolean isBatteryCharging() {

        return mIsBatteryCharging;

        return mIsBatteryCharging;

    }

    }