Merge changes from topic "netstack_constant_cherrypick" am: 10adc9a7b9
Change-Id: I4fa3f771fe93e9b6024828d9c725502629c1ccff
This commit is contained in:
@@ -429,7 +429,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;
|
||||||
|
|||||||
Reference in New Issue
Block a user