Merge "Tethering: remove redundant source code" am: 7f9b3ca809 am: 69c72da2c7

Change-Id: I454f1021bc2a03853f6bc228c805aba99481eb19

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

@@ -741,8 +741,7 @@ public class Tethering {
                 .setContentIntent(pi);
         mLastNotificationId = id;
 
-        notificationManager.notify(null, mLastNotificationId,
+        notificationManager.notify(null, mLastNotificationId, mTetheredNotificationBuilder.build());
-                mTetheredNotificationBuilder.buildInto(new Notification()));
     }
 
     @VisibleForTesting

packages/Tethering/src/com/android/server/connectivity/tethering/TetheringDependencies.java

@@ -24,9 +24,7 @@ import android.net.ip.IpServer;
 import android.net.util.SharedLog;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.INetworkManagementService;
 import android.os.Looper;
-import android.os.ServiceManager;
 
 import com.android.internal.util.StateMachine;
 
@@ -95,16 +93,6 @@ public abstract class TetheringDependencies {
         return new TetheringConfiguration(ctx, log, subId);
     }
 
-    /**
-     * Get a reference to INetworkManagementService to registerTetheringStatsProvider from
-     * OffloadController. Note: This should be removed soon by Usage refactor work in R
-     * development cycle.
-     */
-    public INetworkManagementService getINetworkManagementService() {
-        return INetworkManagementService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
-    }
-
     /**
      * Get a reference to INetd to be used by tethering.
      */

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java

@@ -74,7 +74,6 @@ import android.content.res.Resources;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
 import android.net.INetd;
-import android.net.INetworkPolicyManager;
 import android.net.ITetheringEventCallback;
 import android.net.InetAddresses;
 import android.net.InterfaceConfigurationParcel;
@@ -103,7 +102,6 @@ import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.INetworkManagementService;
 import android.os.Looper;
 import android.os.PersistableBundle;
 import android.os.RemoteException;
@@ -157,9 +155,7 @@ public class TetheringTest {
 
     @Mock private ApplicationInfo mApplicationInfo;
     @Mock private Context mContext;
-    @Mock private INetworkManagementService mNMService;
     @Mock private NetworkStatsManager mStatsManager;
-    @Mock private INetworkPolicyManager mPolicyManager;
     @Mock private OffloadHardwareInterface mOffloadHardwareInterface;
     @Mock private Resources mResources;
     @Mock private TelephonyManager mTelephonyManager;
@@ -342,11 +338,6 @@ public class TetheringTest {
             return new MockTetheringConfiguration(ctx, log, subId);
         }
 
-        @Override
-        public INetworkManagementService getINetworkManagementService() {
-            return mNMService;
-        }
-
         @Override
         public INetd getINetd(Context context) {
             return mNetd;

services/net/Android.bp

@@ -23,7 +23,6 @@ filegroup {
     name: "services-tethering-shared-srcs",
     srcs: [
         ":framework-annotations",
-        "java/android/net/util/NetdService.java",
         "java/android/net/util/NetworkConstants.java",
     ],
     visibility: ["//frameworks/base/packages/Tethering"],