From f964e4ac3cd5514afa18a5b84343bce54319b6a1 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Wed, 23 Sep 2020 17:52:55 -0700
Subject: Add MANAGE_SUBSCRIPTION_PLAN permission

Allow DCT to get SubscriptionPlan info from NetworkPolicyManagerService

Test: atest DcTrackerTest
Bug: 169187737
Change-Id: I61963866fd34f28a3b15f727b5d07c38d6635a75
(cherry picked from commit f133750dccebcc0fbf8b301505ae528b5132a7b8)
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 45642bb84..079ab0479 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -216,6 +216,7 @@
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
     <uses-permission android:name="android.permission.NETWORK_STATS_PROVIDER" />
     <uses-permission android:name="android.permission.HANDLE_CAR_MODE_CHANGES"/>
+    <uses-permission android:name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
 
     <application android:name="PhoneApp"
             android:persistent="true"
-- 
cgit v1.2.3


From e079682e3d7dfe7d6c4be2f432fe1fa249d3b3f9 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Tue, 22 Sep 2020 19:17:08 -0700
Subject: Remove protected broadcast from preferred tty mode

Make ACTION_TTY_PREFERRED_MODE_CHANGE a non-protected broadcast so
Dialer can send it. It's now protected by MODIFY_PHONE_STATE.

Bug: 169196062
Test: manual
Change-Id: I745be34a48eb8e66c45e27a0fda61bb09991675c
(cherry picked from commit 072eebc7cc9e4778b8003cb5542f9fc9e86c2b5f)
---
 AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 079ab0479..8d930bce7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,6 @@
 
     <original-package android:name="com.android.phone" />
 
-    <protected-broadcast android:name="android.telecom.action.TTY_PREFERRED_MODE_CHANGED" />
     <protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
     <protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />
-- 
cgit v1.2.3