diff options
| author | 2017-05-01 17:27:32 +0000 | |
|---|---|---|
| committer | 2017-05-01 17:27:32 +0000 | |
| commit | 9930a35e44db2ffc59e4f5082efdd46d1aaaab2e (patch) | |
| tree | 8a77d6a468adccfeaa1053bcb590a064247e2911 | |
| parent | ba1cc4bb422de9f29a5b38ed4a70ad0c081e2347 (diff) | |
| parent | e24457409e0e3ff623ab42e2b7f208bd2b559f56 (diff) | |
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev
am: e24457409e
Change-Id: I5998fd5c20c43a3a5595919abc4c77a0715ab044
| -rw-r--r-- | core/res/AndroidManifest.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b9b78c47730d..c8cae3a075ab 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -827,16 +827,6 @@ android:description="@string/permdesc_callPhone" android:protectionLevel="dangerous" /> - <!-- Allows an application to manage its own calls, but rely on the system to route focus to the - currently active call. - <p>Protection level: dangerous - --> - <permission android:name="android.permission.MANAGE_OWN_CALLS" - android:permissionGroup="android.permission-group.PHONE" - android:label="@string/permlab_manageOwnCalls" - android:description="@string/permdesc_manageOwnCalls" - android:protectionLevel="dangerous" /> - <!-- Allows an application to access the IMS call service: making and modifying a call <p>Protection level: signature|privileged @@ -924,6 +914,16 @@ android:description="@string/permdesc_answerPhoneCalls" android:protectionLevel="dangerous|runtime" /> + <!-- Allows a calling application which manages it own calls through the self-managed + {@link android.telecom.ConnectionService} APIs. See + {@link android.telecom.PhoneAccount#CAPABILITY_SELF_MANAGED for more information on the + self-managed ConnectionService APIs. + <p>Protection level: normal + --> + <permission android:name="android.permission.MANAGE_OWN_CALLS" + android:label="@string/permlab_manageOwnCalls" + android:description="@string/permdesc_manageOwnCalls" + android:protectionLevel="normal" /> <!-- ====================================================================== --> <!-- Permissions for accessing the device microphone --> |