Merge pull request kivy#1371 from AndreMiras/feature/ticket1049_fix_android_service_crash

tito · web-flow · commit 9e8bb3722fba · 2018-09-13T08:10:25.000+02:00
Sets default service pythonName, fixes kivy#1049
diff --git a/pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/PythonActivity.java b/pythonforandroid/bootstraps/pygame/build/src/org/renpy/android/PythonActivity.java
@@ -351,6 +351,7 @@ public static void start_service(String serviceTitle, String serviceDescription,
         String filesDirectory = PythonActivity.mActivity.mPath.getAbsolutePath();
         serviceIntent.putExtra("androidPrivate", argument);
         serviceIntent.putExtra("androidArgument", filesDirectory);
+        serviceIntent.putExtra("pythonName", "python");
         serviceIntent.putExtra("pythonHome", argument);
         serviceIntent.putExtra("pythonPath", argument + ":" + filesDirectory + "/lib");
         serviceIntent.putExtra("serviceTitle", serviceTitle);
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -350,6 +350,7 @@ public static void start_service(String serviceTitle, String serviceDescription,
         serviceIntent.putExtra("androidPrivate", argument);
         serviceIntent.putExtra("androidArgument", app_root_dir);
         serviceIntent.putExtra("serviceEntrypoint", "service/main.pyo");
+        serviceIntent.putExtra("pythonName", "python");
         serviceIntent.putExtra("pythonHome", app_root_dir);
         serviceIntent.putExtra("pythonPath", app_root_dir + ":" + app_root_dir + "/lib");
         serviceIntent.putExtra("serviceTitle", serviceTitle);
diff --git a/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/webview/build/src/org/kivy/android/PythonActivity.java
@@ -405,6 +405,7 @@ public static void start_service(String serviceTitle, String serviceDescription,
         serviceIntent.putExtra("androidPrivate", argument);
         serviceIntent.putExtra("androidArgument", argument);
         serviceIntent.putExtra("serviceEntrypoint", "service/main.pyo");
+        serviceIntent.putExtra("pythonName", "python");
         serviceIntent.putExtra("pythonHome", argument);
         serviceIntent.putExtra("pythonPath", argument + ":" + filesDirectory + "/lib");
         serviceIntent.putExtra("serviceTitle", serviceTitle);
