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

Merge branch 'master' of git.linphone.org:linphone-android

Browse source 
Conflicts:
	libs/armeabi-v7a/liblinphone.so
	libs/armeabi/liblinphone.so
This commit is contained in:
Simon Morlat 2010-07-06 12:52:58 +02:00
commit 254d2d3f84
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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:versionName="1.0.10" android:versionCode="1010"> android:versionName="1.0.11" android:versionCode="1011">
<uses-sdk android:minSdkVersion="3" /> <uses-sdk android:minSdkVersion="3" />
<application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57"> <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">

2
src/org/linphone/BootReceiver.java
View file

@ -28,7 +28,7 @@ public class BootReceiver extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.pref_autostart_key), true)) { if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.pref_autostart_key), false)) {
Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN); Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN);
lLinphoneServiceIntent.setClass(context, LinphoneService.class); lLinphoneServiceIntent.setClass(context, LinphoneService.class);
context.startService(lLinphoneServiceIntent);; context.startService(lLinphoneServiceIntent);;

2
src/org/linphone/LinphoneService.java
View file

@ -92,7 +92,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
super.onCreate(); super.onCreate();
theLinphone = this; theLinphone = this;
mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotification = new Notification(R.drawable.status_level mNotification = new Notification(R.drawable.status_level
, "" , ""
, System.currentTimeMillis()); , System.currentTimeMillis());