Merge changes from topic "netstack_api_review" into rvc-dev am: 411bf171fa

Change-Id: Iddd40677121e331eb50b74aa379dabaf4632219d
This commit is contained in:
Remi NGUYEN VAN
2020-03-19 01:30:57 +00:00
committed by Automerger Merge Worker

View File

@@ -430,7 +430,6 @@ public class ConnectivityServiceTest {
public Object getSystemService(String name) { public Object getSystemService(String name) {
if (Context.CONNECTIVITY_SERVICE.equals(name)) return mCm; if (Context.CONNECTIVITY_SERVICE.equals(name)) return mCm;
if (Context.NOTIFICATION_SERVICE.equals(name)) return mNotificationManager; if (Context.NOTIFICATION_SERVICE.equals(name)) return mNotificationManager;
if (Context.NETWORK_STACK_SERVICE.equals(name)) return mNetworkStack;
if (Context.USER_SERVICE.equals(name)) return mUserManager; if (Context.USER_SERVICE.equals(name)) return mUserManager;
if (Context.ALARM_SERVICE.equals(name)) return mAlarmManager; if (Context.ALARM_SERVICE.equals(name)) return mAlarmManager;
if (Context.LOCATION_SERVICE.equals(name)) return mLocationManager; if (Context.LOCATION_SERVICE.equals(name)) return mLocationManager;