Merge changes from topic "netstack_constant_cherrypick" am: 10adc9a7b9 am: 4a2454f475
Change-Id: I393d8cc8ace27aaeed9ff6cb26bc52551628b8a1
This commit is contained in:
@@ -429,7 +429,6 @@ public class ConnectivityServiceTest {
|
||||
public Object getSystemService(String name) {
|
||||
if (Context.CONNECTIVITY_SERVICE.equals(name)) return mCm;
|
||||
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.ALARM_SERVICE.equals(name)) return mAlarmManager;
|
||||
if (Context.LOCATION_SERVICE.equals(name)) return mLocationManager;
|
||||
|
||||
Reference in New Issue
Block a user