commit 394d0aa53965d5363255e1f5dda98b68babde1b6
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 26 08:02:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 08:02:21 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent 3f61f0528d6952fcafacfaf5b172532c9ba260e9
parent 4fd1230b210885a3ed871403847262eb3b6062cb

[automerger skipped] Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab am: 06cc01c907 -s ours am: 3fa4aa2ba1 -s ours am: 4fd1230b21 -s ours

am skip reason: Change-Id I6b34ea747ae1831001077f44879bb6828dcecc96 with SHA-1 ca071b79cd is in history

Change-Id: I5f28a0d63527ed3af30566da4170eb86ba7cf56d

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>