commit 6baf19213d375308a1a5d12c142da43bda952ae7
author Paul Hu <paulhu@google.com> Thu Mar 26 05:52:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 05:52:33 2020 +0000
tree f2865beef8b6067c5d530a956ac607b5f6076e74
parent 0f09a19b1cdb0f9ab7a71d00705f3ad5fa64210b
parent f28bba2033b174ff1cb904c191f199dd8063c92a

[automerger skipped] Merge "[TNU04] Add tethering restricted notification" into rvc-dev am: 3d9c05e402 am: 7f416f2841 -s ours am: 8077e1513e -s ours am: f28bba2033 -s ours

am skip reason: Change-Id Ic5baca2d6102886f4c3530ce1e321b5dab6ea9d7 with SHA-1 fe6c41c815 is in history

Change-Id: I60fdd005954e570a869ae5960d0618161e0f76b6

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>