Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e250576 authored by Evan Charlton's avatar Evan Charlton Committed by Android Git Automerger
Browse files

am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev 

* commit '2ad5eb53':
  Move telecom permission to the public API
parents 39545fce 2ad5eb53

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -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_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 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 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";
@@ -4404,9 +4406,9 @@ package android.app { 
    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);

    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);

    method public boolean inKeyguardRestrictedInputMode();

    method public boolean isKeyguardInTrustedState();

    method public boolean isKeyguardLocked();

    method public boolean isKeyguardSecure();

    method public boolean isKeyguardInTrustedState();

    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);

  }

























core/res/AndroidManifest.xml



+12
−0




























Original line number
Diff line number
Diff line








@@ -1269,6 +1269,18 @@













        android:description="@string/permdesc_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.















         @hide -->















    <permission android:name="android.permission.BIND_INCALL_SERVICE"

































core/res/res/values/strings.xml



+10
−0




























Original line number
Diff line number
Diff line








@@ -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. -->















    <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. -->















    <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. -->