Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use NetworkCallback in BatteryStatsService to get connectivity change"

Browse Source
This commit is contained in:
Aaron Huang
2021-03-05 07:03:51 +00:00
committed by Gerrit Code Review
parent cc1e7da83c e96782a567
commit 918e60b615
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2406,13 +2406,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
final BroadcastOptions opts = BroadcastOptions.makeBasic(); final BroadcastOptions opts = BroadcastOptions.makeBasic();
opts.setMaxManifestReceiverApiLevel(Build.VERSION_CODES.M); opts.setMaxManifestReceiverApiLevel(Build.VERSION_CODES.M);
options = opts.toBundle(); options = opts.toBundle();
final IBatteryStats bs = mDeps.getBatteryStatsService();
try {
bs.noteConnectivityChanged(intent.getIntExtra(
ConnectivityManager.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_NONE),
ni.getState().toString());
} catch (RemoteException e) {
}
intent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS); intent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);
} }
try { try {

25
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -16,12 +16,17 @@
package com.android.server.am; package com.android.server.am;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;
import android.annotation.NonNull;
import android.bluetooth.BluetoothActivityEnergyInfo; import android.bluetooth.BluetoothActivityEnergyInfo;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.BatteryStatsInternal; import android.os.BatteryStatsInternal;
@@ -67,6 +72,7 @@ import com.android.internal.os.RpmStats;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.ParseUtils; import com.android.internal.util.ParseUtils;
import com.android.net.module.util.NetworkCapabilitiesUtils;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.connectivity.DataConnectionStats; import com.android.server.connectivity.DataConnectionStats;
import com.android.server.net.BaseNetworkObserver; import com.android.server.net.BaseNetworkObserver;
@@ -218,6 +224,23 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
} }
private ConnectivityManager.NetworkCallback mNetworkCallback =
new ConnectivityManager.NetworkCallback() {
@Override
public void onCapabilitiesChanged(@NonNull Network network,
@NonNull NetworkCapabilities networkCapabilities) {
final String state = networkCapabilities.hasCapability(NET_CAPABILITY_NOT_SUSPENDED)
? "CONNECTED" : "SUSPENDED";
noteConnectivityChanged(NetworkCapabilitiesUtils.getDisplayTransport(
networkCapabilities.getTransportTypes()), state);
}
@Override
public void onLost(Network network) {
noteConnectivityChanged(-1, "DISCONNECTED");
}
};
BatteryStatsService(Context context, File systemDir, Handler handler) { BatteryStatsService(Context context, File systemDir, Handler handler) {
// BatteryStatsImpl expects the ActivityManagerService handler, so pass that one through. // BatteryStatsImpl expects the ActivityManagerService handler, so pass that one through.
mContext = context; mContext = context;
@@ -252,8 +275,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
public void systemServicesReady() { public void systemServicesReady() {
final INetworkManagementService nms = INetworkManagementService.Stub.asInterface( final INetworkManagementService nms = INetworkManagementService.Stub.asInterface(
ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)); ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
try { try {
nms.registerObserver(mActivityChangeObserver); nms.registerObserver(mActivityChangeObserver);
cm.registerDefaultNetworkCallback(mNetworkCallback);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Could not register INetworkManagement event observer " + e); Slog.e(TAG, "Could not register INetworkManagement event observer " + e);
} }