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

Commit 89e9ae17 authored by Alan Stokes's avatar Alan Stokes Committed by Android (Google) Code Review
Browse files

Merge "Move NetworkManagementService into com.android.server.net"

parents 50f3496e b4dec6e9

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

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ import com.android.server.IoThread; 
import com.android.server.LocalManagerRegistry;

import com.android.server.LocalServices;

import com.android.server.LockGuard;

import com.android.server.NetworkManagementInternal;

import com.android.server.PackageWatchdog;

import com.android.server.ServiceThread;

import com.android.server.SystemConfig;
@@ -417,6 +416,7 @@ import com.android.server.criticalevents.CriticalEventLog; 
import com.android.server.firewall.IntentFirewall;

import com.android.server.graphics.fonts.FontManagerInternal;

import com.android.server.job.JobSchedulerInternal;

import com.android.server.net.NetworkManagementInternal;

import com.android.server.os.NativeTombstoneManager;

import com.android.server.pm.Computer;

import com.android.server.pm.Installer;

services/core/java/com/android/server/NetworkManagementInternal.java→services/core/java/com/android/server/net/NetworkManagementInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.net;



/**

 * NetworkManagement local system service interface.

services/core/java/com/android/server/NetworkManagementService.java→services/core/java/com/android/server/net/NetworkManagementService.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.net;



import static android.Manifest.permission.CONNECTIVITY_INTERNAL;

import static android.net.ConnectivityManager.FIREWALL_CHAIN_DOZABLE;
@@ -82,6 +82,8 @@ import com.android.internal.util.HexDump; 
import com.android.internal.util.Preconditions;

import com.android.net.module.util.NetdUtils;

import com.android.net.module.util.NetdUtils.ModifyOperation;

import com.android.server.FgThread;

import com.android.server.LocalServices;



import com.google.android.collect.Maps;

services/core/java/com/android/server/net/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  "presubmit": [

    {

      "name": "FrameworksServicesTests",

      "file_patterns": ["(/|^)NetworkPolicy[^/]*\\.java"],

      "file_patterns": ["(/|^)Network(Policy|Management)[^/]*\\.java"],

      "options": [

        {

          "include-filter": "com.android.server.net."

services/java/com/android/server/SystemServer.java

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ import com.android.server.logcat.LogcatManagerService; 
import com.android.server.media.MediaRouterService;

import com.android.server.media.metrics.MediaMetricsManagerService;

import com.android.server.media.projection.MediaProjectionManagerService;

import com.android.server.net.NetworkManagementService;

import com.android.server.net.NetworkPolicyManagerService;

import com.android.server.net.watchlist.NetworkWatchlistService;

import com.android.server.notification.NotificationManagerService;