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

Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa

Browse Source 
am: 3176d57308

Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe
This commit is contained in:
Xiao Ma
2019-03-19 06:54:43 -07:00
committed by android-build-merger
parent 9d3862e442 3176d57308
commit 2ce206c82d
28 changed files with 319 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,6 @@ import com.android.server.media.MediaSessionService;
import com.android.server.media.projection.MediaProjectionManagerService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
import com.android.server.net.ipmemorystore.IpMemoryStoreService;
import com.android.server.net.watchlist.NetworkWatchlistService;
import com.android.server.notification.NotificationManagerService;
import com.android.server.oemlock.OemLockService;
@@ -1264,14 +1263,6 @@ public final class SystemServer {
}
traceEnd();
traceBeginAndSlog("StartIpMemoryStoreService");
try {
ServiceManager.addService(Context.IP_MEMORY_STORE_SERVICE,
new IpMemoryStoreService(context));
} catch (Throwable e) {
reportWtf("starting IP Memory Store Service", e);
}
traceEnd();
traceBeginAndSlog("StartIpSecService");
try {