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

Commit 9963ff11 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.

parents 99896531 a2251cfb

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
        guava \



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES += \

        src/org/codeaurora/btmultisim/IBluetoothDsdaService.aidl



LOCAL_PACKAGE_NAME := Telecom

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
        <activity android:name="CallActivity"

                android:theme="@style/Theme.Telecomm.Transparent"

                android:permission="android.permission.CALL_PHONE"

                android:configChanges="orientation|screenSize|keyboardHidden"

                android:screenOrientation="nosensor"

                android:excludeFromRecents="true">

            <!-- CALL action intent filters for the various ways of initiating an outgoing call. -->

            <intent-filter>