diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:43:03 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-01 03:43:03 +0000 |
| commit | 294b8513be1ff76fa5f2fdda85e25311f85eaf4e (patch) | |
| tree | 5c9e0e25af95c2f31bc3450b919d602da6703669 | |
| parent | 0dd4b21673cf2004ba99366c652f70a07f00e131 (diff) | |
| parent | e079682e3d7dfe7d6c4be2f432fe1fa249d3b3f9 (diff) | |
| download | Telephony-android11-d1-s7-release.tar.gz | |
Merge cherrypicks of [12742081, 12740729, 12741823, 12741149, 12740897, 12740898, 12741537, 12742616, 12742617, 12742618, 12741671, 12738804, 12740899, 12740900, 12740901, 12740797, 12740798, 12742180, 12742181, 12740730, 12741672, 12741673, 12742182, 12742183] into rvc-d1-releaseandroid-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-release
Change-Id: Iefc822bb49fd10e416e26151e4478e64fed682cb
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 45642bb84..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" /> @@ -216,6 +215,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" |