commit 779a14e6d47fcd0cbf503f3573ed698bd784f875
author Paul Hu <paulhu@google.com> Thu Mar 26 03:26:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 03:26:00 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent 138f3871f2afc38586e206f1c5df29a4f2ff24b7
parent 956410d16bba6975ebaace973208ba543f13a5b1

[automerger skipped] Merge "[TNU02] Update tethering notification by active data subid" into rvc-dev am: cf2a026a65 -s ours am: 5fc12a262c -s ours am: 6137aa0c1b -s ours am: 956410d16b -s ours

am skip reason: Change-Id I799d713326cfbf4dc96c712c6b15ed5a4ac18dd2 with SHA-1 e4beb93149 is in history

Change-Id: I57973da53ca6e374ccf6e69ec536954014197497

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>