Fix scan failures when screen is off on Pixel phones

AltBeacon · Nov 5, 2024 · e49dcf0 · e49dcf0
1 parent ae4ce8a
commit e49dcf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.21.0-beta3 / 2024-11-05
+
+- Fix non-Samsung screen off scan failure (#1208, David G. Young)
+
 ### 2.21.0-beta2 / 2024-10-21
 
 - Fix scan dropouts after 10 minutes (#1207, David G. Young)

diff --git a/lib/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScannerForLollipop.java b/lib/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScannerForLollipop.java
@@ -204,7 +204,8 @@ protected void startScan() {
                             mBeaconManager.getBeaconParsers());
                 }
                 else {
-                    if (Build.MANUFACTURER.equalsIgnoreCase("samsung")) {
+                    if (Build.MANUFACTURER.equalsIgnoreCase("samsung") ||
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
                         LogManager.d(TAG, "Using a wildcard scan filter because the screen is on.  We will switch to a non-empty filter if the screen goes off");
                         // as soon as the screen goes off we will need to start a different scan
                         // that has scan filters