LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Tethering: remove redundant source code"

Browse Source
This commit is contained in:
Mark Chien
2020-01-15 11:51:07 +00:00
committed by Gerrit Code Review
parent 99c7c0fe87 4ddf692e11
commit 18401e3bb0
3 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

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

12
Tethering/src/com/android/server/connectivity/tethering/TetheringDependencies.java
View File

@@ -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.
*/

9
Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java
View File

@@ -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;