Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge with AndroidManifest

Browse source
This commit is contained in:
Margaux Clerc 2015-09-18 18:24:35 +02:00
parent 75b4322a20
commit 4439394089
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="2510" android:installLocation="auto"> android:versionCode="2510" android:installLocation="auto">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22"/> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22"/>
<!-- Permissions for Push Notification --> <!-- Permissions for Push Notification -->
<permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! --> <permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
@ -100,10 +100,10 @@
</activity> </activity>
<activity android:name="org.linphone.OutgoingCallActivity" <activity android:name="org.linphone.OutgoingCallActivity"
android:theme="@style/NoTitle" android:theme="@style/NoTitle"
android:noHistory="true" android:noHistory="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="behind"> android:screenOrientation="behind">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>