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

Commit 979b56b9 authored by David Su's avatar David Su
Browse files

BatteryStats: Move WifiActivityEnergyInfo to android.os.connectivity 

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

Bug: 145244073
Test: compiles
Change-Id: I1a08d200031f0d596bc5265c06ebdcd14f2a8b81
parent 194e9082

core/java/com/android/internal/app/IBatteryStats.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.internal.app; 
import com.android.internal.os.BatteryStatsImpl;



import android.bluetooth.BluetoothActivityEnergyInfo;

import android.net.wifi.WifiActivityEnergyInfo;

import android.os.ParcelFileDescriptor;

import android.os.WorkSource;

import android.os.connectivity.CellularBatteryStats;

import android.os.connectivity.WifiActivityEnergyInfo;

import android.os.connectivity.WifiBatteryStats;

import android.os.connectivity.GpsBatteryStats;

import android.os.health.HealthStatsParceler;

core/java/com/android/internal/os/BatteryStatsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.net.ConnectivityManager; 
import android.net.INetworkStatsService;

import android.net.NetworkStats;

import android.net.Uri;

import android.net.wifi.WifiActivityEnergyInfo;

import android.net.wifi.WifiManager;

import android.os.BatteryManager;

import android.os.BatteryStats;
@@ -56,6 +55,7 @@ import android.os.WorkSource; 
import android.os.WorkSource.WorkChain;

import android.os.connectivity.CellularBatteryStats;

import android.os.connectivity.GpsBatteryStats;

import android.os.connectivity.WifiActivityEnergyInfo;

import android.os.connectivity.WifiBatteryStats;

import android.provider.Settings;

import android.telephony.CellSignalStrength;

services/core/java/com/android/server/am/BatteryExternalStatsWorker.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.annotation.Nullable; 
import android.bluetooth.BluetoothActivityEnergyInfo;

import android.bluetooth.BluetoothAdapter;

import android.content.Context;

import android.net.wifi.WifiActivityEnergyInfo;

import android.net.wifi.WifiManager;

import android.os.BatteryStats;

import android.os.Bundle;
@@ -29,6 +28,7 @@ import android.os.ServiceManager; 
import android.os.SynchronousResultReceiver;

import android.os.SystemClock;

import android.os.ThreadLocalWorkSource;

import android.os.connectivity.WifiActivityEnergyInfo;

import android.telephony.ModemActivityInfo;

import android.telephony.TelephonyManager;

import android.util.IntArray;

services/core/java/com/android/server/am/BatteryStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.net.wifi.WifiActivityEnergyInfo;

import android.os.BatteryStats;

import android.os.BatteryStatsInternal;

import android.os.Binder;
@@ -43,6 +42,7 @@ import android.os.UserManagerInternal; 
import android.os.WorkSource;

import android.os.connectivity.CellularBatteryStats;

import android.os.connectivity.GpsBatteryStats;

import android.os.connectivity.WifiActivityEnergyInfo;

import android.os.connectivity.WifiBatteryStats;

import android.os.health.HealthStatsParceler;

import android.os.health.HealthStatsWriter;