commit 32c41a2afca75fa4425c14e6e2f941740841bcc1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 16 10:12:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 16 10:12:10 2020 +0000
tree 4afbed056479653062cfe206a6965421acd9ba01
parent 47c63f07ac101c409c8be0c9912285a9635fc2fb
parent aaef5e1986f58efdd8302dd23a533aae32f21515

[automerger skipped] Merge "Change TetheringConstants class to final" into rvc-dev am: c78bf0038e am: cf40067421 -s ours am: 52a3d872dc -s ours am: aaef5e1986 -s ours

am skip reason: Change-Id Ia02be3d1d91a08ae4a56b25560ed448c96a693db with SHA-1 4b896ba32b is in history

Change-Id: Ia97c8da0bf5299dbe11c21323501507b0fb27a28

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>