From 5cecb44d30dd22b0891e0a3cde61cbf6cbcc895e Mon Sep 17 00:00:00 2001
From: Ashwini Oruganti <ashfall@google.com>
Date: Tue, 10 Mar 2020 15:35:25 -0700
Subject: [PATCH] CarrierDefaultApp: Add an exported flag in manifest

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: I03108f520f7e04a5ddb9c43c2075591bd6c45fdf
---
 packages/CarrierDefaultApp/AndroidManifest.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml
index f1165468c0ad3..4473610f647a6 100644
--- a/packages/CarrierDefaultApp/AndroidManifest.xml
+++ b/packages/CarrierDefaultApp/AndroidManifest.xml
@@ -33,7 +33,8 @@
         android:directBootAware="true"
         android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher_android">
-        <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver">
+        <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />
                 <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_RESET" />
@@ -57,7 +58,8 @@
         <activity-alias
             android:name="com.android.carrierdefaultapp.URLHandlerActivity"
             android:targetActivity="com.android.carrierdefaultapp.CaptivePortalLoginActivity"
-            android:enabled="false" >
+            android:enabled="false"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT"/>