From bef8719ce050747cb04288b39704c92151909132 Mon Sep 17 00:00:00 2001 From: Hugo Saint-Vignes Date: Fri, 5 Feb 2021 17:10:07 +0100 Subject: [PATCH] [simulator/android] Handle getSerialNumber exception Based on SDL commit : https://github.com/spurious/SDL-mirror/commit/85c1d4079299a73b089744033546e32afc87919c Change-Id: Ie6810dae48f5944a515ee016f228ecf33edd8fc4 --- .../android/src/java/org/libsdl/app/HIDDeviceUSB.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java index c9fc58ece..ad9b06ff4 100644 --- a/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java +++ b/ion/src/simulator/android/src/java/org/libsdl/app/HIDDeviceUSB.java @@ -51,7 +51,12 @@ class HIDDeviceUSB implements HIDDevice { public String getSerialNumber() { String result = null; if (Build.VERSION.SDK_INT >= 21) { - result = mDevice.getSerialNumber(); + try { + result = mDevice.getSerialNumber(); + } + catch (SecurityException exception) { + //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage()); + } } if (result == null) { result = "";