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

Commit ac8b4509 authored by Hector Dearman's avatar Hector Dearman Committed by Android (Google) Code Review
Browse files

Merge "Fix SDK build"

parents b8bf83fd 923382cb

core/res/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -1121,10 +1121,10 @@ 
                android:protectionLevel="normal" />



    <!--Allows an app which implements the

        {@link InCallService} API to be eligible to be enabled as a calling companion app. This

        means that the Telecom framework will bind to the app's InCallService implementation when

        there are calls active. The app can use the InCallService API to view information about

        calls on the system and control these calls.

        {@link android.telecom.InCallService InCallService} API to be eligible to be enabled as a

        calling companion app. This means that the Telecom framework will bind to the app's

        InCallService implementation when there are calls active. The app can use the InCallService

        API to view information about calls on the system and control these calls.

        <p>Protection level: normal

    -->

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

telecomm/java/android/telecom/TelecomManager.java

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ public class TelecomManager { 
    /**

     * A boolean meta-data value indicating whether an {@link InCallService} implements an

     * in-call user interface to be used while the device is in car-mode (see

     * {@link android.content.res.Configuration.UI_MODE_TYPE_CAR}).

     * {@link android.content.res.Configuration#UI_MODE_TYPE_CAR}).

     */

    public static final String METADATA_IN_CALL_SERVICE_CAR_MODE_UI =

            "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";