diff --git a/app/src/main/java/net/sourceforge/opencamera/DeviceSettings.java b/app/src/main/java/net/sourceforge/opencamera/DeviceSettings.java
index 515d420ae5cc57aa4623a94ed6fba510668db00d..67c1b953f83be4c64cee874536a3bee533ab9c8f 100644
--- a/app/src/main/java/net/sourceforge/opencamera/DeviceSettings.java
+++ b/app/src/main/java/net/sourceforge/opencamera/DeviceSettings.java
@@ -40,8 +40,8 @@ public class DeviceSettings {
         return isMurena && isOne;
     }
 
-    public static boolean isMurenaTwo() {
-        return Build.DEVICE.toLowerCase(Locale.US).contains("two");
+    public static boolean isHwKillSwitch() {
+        return Build.DEVICE.toLowerCase(Locale.US).contains("two") || Build.DEVICE.toLowerCase(Locale.US).contains("android");
     }
 
     public static boolean isTablet(Context context) {
diff --git a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
index a7151a819a48f3c3894f6a722305ade66c9145e6..118114ca3d9d3cf3e791c86fbcb4c32ce49a7b53 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
@@ -1639,7 +1639,7 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
             mainUI.onKeyUp(keyCode, event);
         }
 
-        if (!camera_in_background && keyCode == 131 && DeviceSettings.isMurenaTwo()) {
+        if (!camera_in_background && (keyCode == 131 || keyCode == 61) && DeviceSettings.isHwKillSwitch()) {
             String cameraState = Utils.getProperty("persist.sys.hwswitch.state", null);
             if (cameraState == null) return super.onKeyUp(keyCode, event);
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
index 0ef85af2c448cb62f11b3ffa83b8210900519bd0..2cfabf6847ef09f08853051b69f6723a27a17ea3 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
@@ -2639,7 +2639,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public void onCameraError() {
-        if (DeviceSettings.isMurenaTwo()) return;
+        if (DeviceSettings.isHwKillSwitch()) return;
         main_activity.getPreview().showToast(null, R.string.camera_error);
     }
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
index 3e49690a9f4efca4a0db9329f1caf0bbbd02fc9f..6812a1885d9e8a4de3623319b7211168735d3293 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
@@ -2121,7 +2121,7 @@ public class DrawPreview {
             int pixels_offset = (int) (20 * scale_font + 0.5f); // convert dps to pixels
             if( preview.hasPermissions() ) {
                 String cameraState = Utils.getProperty("persist.sys.hwswitch.state", null);
-                if (cameraState != null && DeviceSettings.isMurenaTwo() && preview.openCameraFailed()) {
+                if (cameraState != null && DeviceSettings.isHwKillSwitch() && preview.openCameraFailed()) {
                     boolean enabled = Objects.equals(cameraState, "1");
                     int text1 = enabled ? R.string.failed_to_open_camera_two_1_disabled : R.string.failed_to_open_camera_two_1_enabled;
                     int text2 = enabled ? R.string.failed_to_open_camera_two_2_disabled : R.string.failed_to_open_camera_two_2_enabled;
@@ -2129,7 +2129,7 @@ public class DrawPreview {
                     canvas.drawText(getContext().getResources().getString(text2), canvas.getWidth() / 2.0f, canvas.getHeight() / 2.0f + pixels_offset, p);
                 }
 
-                if ( !DeviceSettings.isMurenaTwo() && preview.openCameraFailed() ) {
+                if ( !DeviceSettings.isHwKillSwitch() && preview.openCameraFailed() ) {
                     canvas.drawText(getContext().getResources().getString(R.string.failed_to_open_camera_1), canvas.getWidth() / 2.0f, canvas.getHeight() / 2.0f, p);
                     canvas.drawText(getContext().getResources().getString(R.string.failed_to_open_camera_2), canvas.getWidth() / 2.0f, canvas.getHeight() / 2.0f + pixels_offset, p);
                     canvas.drawText(getContext().getResources().getString(R.string.failed_to_open_camera_3), canvas.getWidth() / 2.0f, canvas.getHeight() / 2.0f + 2 * pixels_offset, p);