Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move telecom permission to the public API" into lmp-mr1-dev

Browse Source
This commit is contained in:
Evan Charlton
2014-10-27 17:08:31 +00:00
committed by Android (Google) Code Review
parent 649fee0326 cef5a5404a
commit 2ad5eb538d
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -113,6 +113,8 @@ package android {
field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS"; field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
field public static final java.lang.String REGISTER_CONNECTION_MANAGER = "android.permission.REGISTER_CONNECTION_MANAGER";
field public static final java.lang.String REGISTER_PROVIDER_OR_SUBSCRIPTION = "android.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION";
field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
@@ -4404,9 +4406,9 @@ package android.app {
method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
method public boolean inKeyguardRestrictedInputMode(); method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardInTrustedState();
method public boolean isKeyguardLocked(); method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure(); method public boolean isKeyguardSecure();
method public boolean isKeyguardInTrustedState();
method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String); method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
} }

12
core/res/AndroidManifest.xml
View File

@@ -1269,6 +1269,18 @@
android:description="@string/permdesc_use_sip" android:description="@string/permdesc_use_sip"
android:label="@string/permlab_use_sip" /> android:label="@string/permlab_use_sip" />
<!-- Protects the ability to register any PhoneAccount with a capability flags of either
PhoneAccount#CAPABILITY_CALL_PROVIDER or PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. -->
<permission android:name="android.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:description="@string/permdesc_register_provider"
android:label="@string/permlab_register_provider" />
<permission android:name="android.permission.REGISTER_CONNECTION_MANAGER"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:description="@string/permdesc_connection_manager"
android:label="@string/permlab_connection_manager" />
<!-- @SystemApi Allows an application to bind to InCallService implementations. <!-- @SystemApi Allows an application to bind to InCallService implementations.
@hide --> @hide -->
<permission android:name="android.permission.BIND_INCALL_SERVICE" <permission android:name="android.permission.BIND_INCALL_SERVICE"

10
core/res/res/values/strings.xml
View File

@@ -2114,6 +2114,16 @@
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</string> <string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_register_provider">register new telecom connection</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_register_provider">Allows the app to register new telecom connections.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_connection_manager">manage telecom connections</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_connection_manager">Allows the app to manage telecom connections.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bind_incall_service">interact with in-call screen</string> <string name="permlab_bind_incall_service">interact with in-call screen</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->