diff --git a/shell/android-studio/reicast/src/main/AndroidManifest.xml b/shell/android-studio/reicast/src/main/AndroidManifest.xml index 9e00ee9e6..9f99de1e3 100644 --- a/shell/android-studio/reicast/src/main/AndroidManifest.xml +++ b/shell/android-studio/reicast/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ + javaclass) { + ActivityManager manager = (ActivityManager) + getSystemService(Context.ACTIVITY_SERVICE); + try { + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (javaclass.getName().equals( + service.service.getClassName())) { + return true; + } + } + } catch (NullPointerException e) { + e.printStackTrace(); + } + return false; + } + @Override protected void onPause() { super.onPause(); @@ -547,12 +573,14 @@ public class GL2JNIActivity extends Activity { protected void onDestroy() { super.onDestroy(); moga.onDestroy(); + if (serviceRunning(EmuService.class)) + stopService(serviceIntent); + JNIdc.stop(); } @Override protected void onStop() { // TODO Auto-generated method stub - JNIdc.stop(); mView.onStop(); super.onStop(); } diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java index 0126c5097..05938898e 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/EmuService.java @@ -5,6 +5,7 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.support.v4.app.NotificationCompat; + import com.reicast.emulator.R; public class EmuService extends Service { @@ -30,9 +31,9 @@ public class EmuService extends Service { NotificationCompat.Builder builder = new NotificationCompat.Builder(this) .setSmallIcon(R.drawable.ic_launcher) - .setTicker("Emulator ticker message") - .setContentTitle("Emulator notification title") - .setContentText("Emulator notification content") + .setTicker(getString(R.string.service_ticker)) + .setContentTitle(getString(R.string.service_title)) + .setContentText(getString(R.string.service_content)) .setContentIntent(pendingIntent); startForeground(FOREGROUND_ID, builder.build()); return START_STICKY_COMPATIBILITY; diff --git a/shell/android-studio/reicast/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml index 72ebd42eb..95c6834a7 100644 --- a/shell/android-studio/reicast/src/main/res/values/strings.xml +++ b/shell/android-studio/reicast/src/main/res/values/strings.xml @@ -129,6 +129,10 @@ Download VMU Logcat saved and copied to clipboard\nPlease paste inside the Github issue + + reicast is running... + reicast is running... + Emulator service is currently running Back