commit 579bdf6c89f0692a161fc27cb3729c324e403268
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 09:33:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 09:33:03 2020 +0000
tree 609347fa1cb75cf69e835f6153b97379e614ceec
parent 9300899741af6a42c9088d63185bbcb12070467f
parent 87e6d7e0f1cd72d8ec3c371707eb0557976688bd

Merge "Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: 49c50fb36b am: 23c26c7a77" into rvc-d1-dev-plus-aosp am: 6d09506bd5 am: 87e6d7e0f1

Change-Id: Iff61b53d4d85530d93a7d85e06b0b9a5c7cd27cf

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>