commit 8c3aeedd6f9e24c0ef378245d5049e44aacf30b9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 26 08:03:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 08:03:35 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent ecc80a1051213aae6785f10c6b6f62a3d99e97a2
parent c5e0228615b9ec5e40b65072a3de851c555ccf64

[automerger skipped] Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab -s ours am: 9df51b1417 -s ours am: 165e46f815 -s ours am: c5e0228615 -s ours

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

Change-Id: I779833a31bce922c36406ffb196f4ed750400c5e

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>