Merge "Get RDNSS option information from kernel instead of Netd."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a11b2c..8750795 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,6 +21,7 @@
android:sharedUserId="android.uid.networkstack"
android:versionCode="319999900"
android:versionName="s_aml_319999900"
+ coreApp="true"
>
<!-- Permissions must be defined here, and not in the base manifest, as the network stack
running in the system server process does not need any permission, and having privileged
diff --git a/AndroidManifest_InProcess.xml b/AndroidManifest_InProcess.xml
index 2cb146a..6c64d87 100644
--- a/AndroidManifest_InProcess.xml
+++ b/AndroidManifest_InProcess.xml
@@ -19,7 +19,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.networkstack.inprocess"
android:sharedUserId="android.uid.system"
- android:process="system">
+ android:process="system"
+ coreApp="true">
<application>
<service android:name="com.android.server.NetworkStackService"
android:process="system"
diff --git a/AndroidManifest_Next.xml b/AndroidManifest_Next.xml
index 9ad69ae..244d465 100644
--- a/AndroidManifest_Next.xml
+++ b/AndroidManifest_Next.xml
@@ -18,5 +18,6 @@
package="com.android.networkstack"
android:sharedUserId="android.uid.networkstack"
android:versionCode="320000000"
- android:versionName="T-next">
+ android:versionName="T-next"
+ coreApp="true">
</manifest>
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index 131b3b2..36b6492 100755
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -623,6 +623,10 @@
// even before notifyNetworkConnected.
mLinkProperties = new LinkProperties();
mNetworkCapabilities = new NetworkCapabilities(null);
+
+ Log.d(TAG, "Starting on network " + mNetwork
+ + " with capport HTTPS URL " + Arrays.toString(mCaptivePortalHttpsUrls)
+ + " and HTTP URL " + Arrays.toString(mCaptivePortalHttpUrls));
}
/**
