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

Commit 6f0e4168 authored by David Su's avatar David Su
Browse files

Move WifiActivityEnergyInfo to android.os.connectivity 

Move WifiActivityEnergyInfo out of the Wifi Mainline
module so that it can use @hide PowerProfile.

Bug: 145244073
Test: atest FrameworksWifiApiTests
Change-Id: I168c3e187f391ac31660034e7873c8438c1096b3
parent 979b56b9

api/system-current.txt

+27 −27
Original line number Diff line number Diff line
@@ -5319,32 +5319,6 @@ package android.net.wifi { 
    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApInfo> CREATOR;

  }













  public final class WifiActivityEnergyInfo implements android.os.Parcelable {













    ctor public WifiActivityEnergyInfo(long, int, long, long, long, long, long);













    method public int describeContents();













    method public long getControllerEnergyUsedMicroJoules();













    method public long getControllerIdleDurationMillis();













    method public long getControllerRxDurationMillis();













    method public long getControllerScanDurationMillis();













    method public long getControllerTxDurationMillis();













    method public int getStackState();













    method public long getTimeSinceBootMillis();













    method public boolean isValid();













    method public void setControllerEnergyUsedMicroJoules(long);













    method public void setControllerIdleDurationMillis(long);













    method public void setControllerRxDurationMillis(long);













    method public void setControllerScanDurationMillis(long);













    method public void setControllerTxDurationMillis(long);













    method public void setStackState(int);













    method public void setTimeSinceBootMillis(long);













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













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiActivityEnergyInfo> CREATOR;













    field public static final int STACK_STATE_INVALID = 0; // 0x0













    field public static final int STACK_STATE_STATE_ACTIVE = 1; // 0x1













    field public static final int STACK_STATE_STATE_IDLE = 3; // 0x3













    field public static final int STACK_STATE_STATE_SCANNING = 2; // 0x2













  }



























  public final class WifiClient implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.net.MacAddress getMacAddress();










@@ -5585,7 +5559,7 @@ package android.net.wifi {













  }





























  public static interface WifiManager.OnWifiActivityEnergyInfoListener {













    method public void onWifiActivityEnergyInfo(@Nullable android.net.wifi.WifiActivityEnergyInfo);













    method public void onWifiActivityEnergyInfo(@Nullable android.os.connectivity.WifiActivityEnergyInfo);















  }





























  public static interface WifiManager.OnWifiUsabilityStatsListener {










@@ -6585,6 +6559,32 @@ package android.os.connectivity {













    field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR;















  }



























  public final class WifiActivityEnergyInfo implements android.os.Parcelable {













    ctor public WifiActivityEnergyInfo(long, int, long, long, long, long, long);













    method public int describeContents();













    method public long getControllerEnergyUsedMicroJoules();













    method public long getControllerIdleDurationMillis();













    method public long getControllerRxDurationMillis();













    method public long getControllerScanDurationMillis();













    method public long getControllerTxDurationMillis();













    method public int getStackState();













    method public long getTimeSinceBootMillis();













    method public boolean isValid();













    method public void setControllerEnergyUsedMicroJoules(long);













    method public void setControllerIdleDurationMillis(long);













    method public void setControllerRxDurationMillis(long);













    method public void setControllerScanDurationMillis(long);













    method public void setControllerTxDurationMillis(long);













    method public void setStackState(int);













    method public void setTimeSinceBootMillis(long);













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













    field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.WifiActivityEnergyInfo> CREATOR;













    field public static final int STACK_STATE_INVALID = 0; // 0x0













    field public static final int STACK_STATE_STATE_ACTIVE = 1; // 0x1













    field public static final int STACK_STATE_STATE_IDLE = 3; // 0x3













    field public static final int STACK_STATE_STATE_SCANNING = 2; // 0x2













  }



























  public final class WifiBatteryStats implements android.os.Parcelable {















    method public int describeContents();















    method public long getEnergyConsumedMaMillis();

































wifi/java/android/net/wifi/WifiActivityEnergyInfo.aidl→core/java/android/os/connectivity/WifiActivityEnergyInfo.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -14,6 +14,6 @@













 * limitations under the License.















 */





























package android.net.wifi;













package android.os.connectivity;































parcelable WifiActivityEnergyInfo;
























wifi/java/android/net/wifi/WifiActivityEnergyInfo.java→core/java/android/os/connectivity/WifiActivityEnergyInfo.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -14,7 +14,7 @@













 * limitations under the License.















 */





























package android.net.wifi;













package android.os.connectivity;































import android.annotation.IntDef;















import android.annotation.NonNull;

































wifi/java/android/net/wifi/IOnWifiActivityEnergyInfoListener.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,7 +16,7 @@





























package android.net.wifi;





























import android.net.wifi.WifiActivityEnergyInfo;













import android.os.connectivity.WifiActivityEnergyInfo;































/**















 * Interface for Wi-Fi activity energy info listener.

































wifi/java/android/net/wifi/IWifiManager.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,6 @@ import android.net.wifi.ITrafficStateCallback;













import android.net.wifi.ITxPacketCountListener;















import android.net.wifi.ScanResult;















import android.net.wifi.SoftApConfiguration;













import android.net.wifi.WifiActivityEnergyInfo;















import android.net.wifi.WifiConfiguration;















import android.net.wifi.WifiInfo;















import android.net.wifi.WifiNetworkSuggestion;









@@ -45,6 +44,7 @@ import android.net.wifi.WifiNetworkSuggestion;













import android.os.Messenger;















import android.os.ResultReceiver;















import android.os.WorkSource;













import android.os.connectivity.WifiActivityEnergyInfo;































/**















 * Interface that allows controlling and querying Wi-Fi connectivity.