commit 3f61f0528d6952fcafacfaf5b172532c9ba260e9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 26 08:01:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 08:01:39 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent 6baf19213d375308a1a5d12c142da43bda952ae7
parent 98e88d1a73ff9b8e329b43ce008ddb343870f63b

[automerger skipped] Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e am: 28e7899139 -s ours am: 49e7e8a383 -s ours am: 98e88d1a73 -s ours

am skip reason: Change-Id I68123e6dd04ccae5da2ecd7526c11d9f835d1d57 with SHA-1 6976fae02e is in history

Change-Id: Idabb714b5ae7ca5a524ae536068e337e2705c459

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>