Merge "Address leftover comments on 923337 and 930217." am: 1e97aab6f4 am: 55a22b5d17

am: 1d7b92b9d5

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65

diff --cc api/current.txt
index a0fd17d,2462f38..1394ba3
mode 100644,100755..100644
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt

diff --cc api/system-current.txt
index 7c3defd,1a783da..b419851
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -119,10 -95,9 +119,11 @@@ package android 
      field public static final String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";
      field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";
      field public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";
 +    field public static final String NETWORK_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING";
 +    field public static final String NETWORK_MANAGED_PROVISIONING = "android.permission.NETWORK_MANAGED_PROVISIONING";
      field public static final String NETWORK_SCAN = "android.permission.NETWORK_SCAN";
      field public static final String NETWORK_SETUP_WIZARD = "android.permission.NETWORK_SETUP_WIZARD";
+     field public static final String NETWORK_SIGNAL_STRENGTH_WAKEUP = "android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP";
      field public static final String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP";
      field public static final String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";
      field public static final String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";

diff --cc core/java/android/net/LinkProperties.java
Simple merge

diff --cc core/java/android/net/NetworkRequest.java
Simple merge

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge