commit 799e84ed01dcbdbd597f261db7ba7c20f3301cca
author Remi NGUYEN VAN <reminv@google.com> Thu Mar 19 01:21:29 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 19 01:21:29 2020 +0000
tree 7e3defb7cbbbca254c7feb287163272ac28610b6
parent 27247d1f5de1c54b9f7eb6c02db57919f7bc92fc
parent ccea0bb385f30d47a6f04a03d4e4ec42256f0bb0

Merge changes from topic "netstack_api_review" into rvc-dev

* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index f3b61ba..f7ad09c 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -428,7 +428,6 @@
         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;