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

Merge "Update NetworkScoreService to use SystemService" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-06 19:44:52 +00:00
committed by Android (Google) Code Review
parent a15aa6e2fd ce2d963d2e
commit 3a0681d137
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/NetworkScoreService.java
View File

@@ -128,6 +128,30 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
} }
}; };
public static final class Lifecycle extends SystemService {
private final NetworkScoreService mService;
public Lifecycle(Context context) {
super(context);
mService = new NetworkScoreService(context);
}
@Override
public void onStart() {
Log.i(TAG, "Registering " + Context.NETWORK_SCORE_SERVICE);
publishBinderService(Context.NETWORK_SCORE_SERVICE, mService);
}
@Override
public void onBootPhase(int phase) {
if (phase == PHASE_SYSTEM_SERVICES_READY) {
mService.systemReady();
} else if (phase == PHASE_BOOT_COMPLETED) {
mService.systemRunning();
}
}
}
/** /**
* Clears scores when the active scorer package is no longer valid and * Clears scores when the active scorer package is no longer valid and
* manages the service connection. * manages the service connection.

23
services/java/com/android/server/SystemServer.java
View File

@@ -725,7 +725,6 @@ public final class SystemServer {
NetworkStatsService networkStats = null; NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null; NetworkPolicyManagerService networkPolicy = null;
ConnectivityService connectivity = null; ConnectivityService connectivity = null;
NetworkScoreService networkScore = null;
NsdService serviceDiscovery= null; NsdService serviceDiscovery= null;
WindowManagerService wm = null; WindowManagerService wm = null;
SerialService serial = null; SerialService serial = null;
@@ -1090,12 +1089,7 @@ public final class SystemServer {
} }
traceBeginAndSlog("StartNetworkScoreService"); traceBeginAndSlog("StartNetworkScoreService");
try { mSystemServiceManager.startService(NetworkScoreService.Lifecycle.class);
networkScore = new NetworkScoreService(context);
ServiceManager.addService(Context.NETWORK_SCORE_SERVICE, networkScore);
} catch (Throwable e) {
reportWtf("starting Network Score Service", e);
}
traceEnd(); traceEnd();
traceBeginAndSlog("StartNetworkStatsService"); traceBeginAndSlog("StartNetworkStatsService");
@@ -1728,7 +1722,6 @@ public final class SystemServer {
final NetworkStatsService networkStatsF = networkStats; final NetworkStatsService networkStatsF = networkStats;
final NetworkPolicyManagerService networkPolicyF = networkPolicy; final NetworkPolicyManagerService networkPolicyF = networkPolicy;
final ConnectivityService connectivityF = connectivity; final ConnectivityService connectivityF = connectivity;
final NetworkScoreService networkScoreF = networkScore;
final LocationManagerService locationF = location; final LocationManagerService locationF = location;
final CountryDetectorService countryDetectorF = countryDetector; final CountryDetectorService countryDetectorF = countryDetector;
final NetworkTimeUpdateService networkTimeUpdaterF = networkTimeUpdater; final NetworkTimeUpdateService networkTimeUpdaterF = networkTimeUpdater;
@@ -1789,13 +1782,6 @@ public final class SystemServer {
reportWtf("starting System UI", e); reportWtf("starting System UI", e);
} }
traceEnd(); traceEnd();
traceBeginAndSlog("MakeNetworkScoreReady");
try {
if (networkScoreF != null) networkScoreF.systemReady();
} catch (Throwable e) {
reportWtf("making Network Score Service ready", e);
}
traceEnd();
traceBeginAndSlog("MakeNetworkManagementServiceReady"); traceBeginAndSlog("MakeNetworkManagementServiceReady");
try { try {
if (networkManagementF != null) networkManagementF.systemReady(); if (networkManagementF != null) networkManagementF.systemReady();
@@ -1917,13 +1903,6 @@ public final class SystemServer {
} }
traceEnd(); traceEnd();
traceBeginAndSlog("MakeNetworkScoreServiceReady");
try {
if (networkScoreF != null) networkScoreF.systemRunning();
} catch (Throwable e) {
reportWtf("Notifying NetworkScoreService running", e);
}
traceEnd();
traceBeginAndSlog("IncidentDaemonReady"); traceBeginAndSlog("IncidentDaemonReady");
try { try {
// TODO: Switch from checkService to getService once it's always // TODO: Switch from checkService to getService once it's always