commit 0f09a19b1cdb0f9ab7a71d00705f3ad5fa64210b
author Paul Hu <paulhu@google.com> Thu Mar 26 05:52:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 05:52:21 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent b58dfa1acc1f8f0ec5998e157cc79a1754ff4bd1
parent a16b349043e3d6dd9eb98cb499e211a265f9737f

[automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 -s ours am: bd39aeaa53 -s ours am: 28e30a1f1d -s ours am: a16b349043 -s ours

am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 972f031fa5 is in history

Change-Id: Ic59c3b26329518ec0834da3865a7a6dc5e465c8b

Tethering/AndroidManifest.xml

diff --git a/Tethering/AndroidManifest.xml b/Tethering/AndroidManifest.xml
index 9328611..ab25747 100644
--- a/Tethering/AndroidManifest.xml
+++ b/Tethering/AndroidManifest.xml
@@ -44,7 +44,8 @@
         android:extractNativeLibs="false"
         android:persistent="true">
         <service android:name="com.android.server.connectivity.tethering.TetheringService"
-                 android:permission="android.permission.MAINLINE_NETWORK_STACK">
+                 android:permission="android.permission.MAINLINE_NETWORK_STACK"
+                 android:exported="true">
             <intent-filter>
                 <action android:name="android.net.ITetheringConnector"/>
             </intent-filter>

Tethering/AndroidManifest_InProcess.xml

diff --git a/Tethering/AndroidManifest_InProcess.xml b/Tethering/AndroidManifest_InProcess.xml
index 02ea551..bf1f001 100644
--- a/Tethering/AndroidManifest_InProcess.xml
+++ b/Tethering/AndroidManifest_InProcess.xml
@@ -24,7 +24,8 @@
     <application>
         <service android:name="com.android.server.connectivity.tethering.TetheringService"
                  android:process="system"
-                 android:permission="android.permission.MAINLINE_NETWORK_STACK">
+                 android:permission="android.permission.MAINLINE_NETWORK_STACK"
+                 android:exported="true">
             <intent-filter>
                 <action android:name="android.net.ITetheringConnector.InProcess"/>
             </intent-filter>