commit b58dfa1acc1f8f0ec5998e157cc79a1754ff4bd1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 05:51:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 05:51:54 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent b85e38468c5d1fd900e4f11c59f7d97183539cb9
parent 1686ca92e9860c09627864341c14aa22011694b1

Merge "[automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: 4472b04bd2 am: 477873b6a3 -s ours" into rvc-d1-dev-plus-aosp am: 2a143525fc -s ours am: 1686ca92e9 -s ours

am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 71007d31b5 is in history

Change-Id: Id17a98af333ea2dba763b051adde4e3f8e5f508b

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>