2 files changed, 12 insertions, 7 deletions

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.java
index d7b75e5a6..9d4ed80b4 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.java
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.java
@@ -45,7 +45,9 @@ public class YuzuApplication extends Application {
         DirectoryInitialization.start(getApplicationContext());
 
         NativeLibrary.LogDeviceInfo();
-        createNotificationChannel();
+
+        // TODO(bunnei): Disable notifications until we support app suspension.
+        //createNotificationChannel();
 
         databaseHelper = new GameDatabase(this);
     }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.java
index f4fca40e4..41103ec5b 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.java
@@ -33,7 +33,6 @@ import org.yuzu.yuzu_emu.utils.ControllerMappingHelper;
 import org.yuzu.yuzu_emu.utils.ForegroundService;
 
 import java.lang.annotation.Retention;
-import java.util.List;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -57,7 +56,8 @@ public final class EmulationActivity extends AppCompatActivity {
     private EmulationFragment mEmulationFragment;
     private SharedPreferences mPreferences;
     private ControllerMappingHelper mControllerMappingHelper;
-    private Intent foregroundService;
+    // TODO(bunnei): Disable notifications until we support app suspension.
+//    private Intent foregroundService;
     private boolean activityRecreated;
     private String mSelectedTitle;
     private String mPath;
@@ -73,12 +73,14 @@ public final class EmulationActivity extends AppCompatActivity {
     }
 
     public static void tryDismissRunningNotification(Activity activity) {
-        NotificationManagerCompat.from(activity).cancel(EMULATION_RUNNING_NOTIFICATION);
+        // TODO(bunnei): Disable notifications until we support app suspension.
+//        NotificationManagerCompat.from(activity).cancel(EMULATION_RUNNING_NOTIFICATION);
     }
 
     @Override
     protected void onDestroy() {
-        stopService(foregroundService);
+        // TODO(bunnei): Disable notifications until we support app suspension.
+//        stopService(foregroundService);
         super.onDestroy();
     }
 
@@ -131,8 +133,9 @@ public final class EmulationActivity extends AppCompatActivity {
         mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
         // Start a foreground service to prevent the app from getting killed in the background
-        foregroundService = new Intent(EmulationActivity.this, ForegroundService.class);
-        startForegroundService(foregroundService);
+        // TODO(bunnei): Disable notifications until we support app suspension.
+//        foregroundService = new Intent(EmulationActivity.this, ForegroundService.class);
+//        startForegroundService(foregroundService);
     }
 
     @Override