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

Commit aea93d26 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "New Permission for Call Redirection service" am: 8f08ba79 am: c92bc643 

am: 3cd0616f

Change-Id: I8d2700cf57596b854a3b472afc0b34773c922b64
parents 8ad9ef4a 3cd0616f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ package android { 
    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";

    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

    field public static final java.lang.String BIND_AUTOFILL_SERVICE = "android.permission.BIND_AUTOFILL_SERVICE";

    field public static final java.lang.String BIND_CALL_REDIRECTION_SERVICE = "android.permission.BIND_CALL_REDIRECTION_SERVICE";

    field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";

    field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";

    field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1932,6 +1932,13 @@ 
    <permission android:name="android.permission.BIND_SCREENING_SERVICE"

        android:protectionLevel="signature|privileged" />



    <!-- Must be required by a {@link android.telecom.CallRedirectionService},

         to ensure that only the system can bind to it.

         <p>Protection level: signature|privileged

    -->

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

                android:protectionLevel="signature|privileged" />



    <!-- Must be required by a {@link android.telecom.ConnectionService},

         to ensure that only the system can bind to it.

         @deprecated {@link android.telecom.ConnectionService}s should require