Merge branch 'fix-iae-from-user-switch-watching' into 2.16.3-beta1

AltBeacon · Jun 5, 2019 · bebca7a · bebca7a
2 parents 0001342 + b1a46d5
commit bebca7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 ### Development
 
-- Prevent NPE in BluetoothMedic#runScanTest. (#893 Van Hoang Tran) 
-- Prevent NPE when ScanState restore hangs or ScanJob thread is slow to start (#890, David G. Young)
 - Fix thread leak with 0 regions and settings applied, (#888, David G. Young)
+- Prevent NPE when ScanState restore hangs or ScanJob thread is slow to start (#890, David G. Young)
+- Prevent crash from IAE when ending scan cycle (#891, David G. Young)
+- Prevent NPE in BluetoothMedic#runScanTest. (#893 Van Hoang Tran)
 
 ### 2.16.2 / 2019-05-29
 

diff --git a/lib/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScanner.java b/lib/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScanner.java
@@ -513,7 +513,10 @@ public void onReceive(Context context, Intent intent) {
     }
     protected void cleanupCancelAlarmOnUserSwitch() {
         if (mCancelAlarmOnUserSwitchBroadcastReceiver != null) {
-            mContext.unregisterReceiver(mCancelAlarmOnUserSwitchBroadcastReceiver);
+            try {
+                mContext.unregisterReceiver(mCancelAlarmOnUserSwitchBroadcastReceiver);
+            }
+            catch (IllegalArgumentException e) {} // thrown if OS does not think it was registered
             mCancelAlarmOnUserSwitchBroadcastReceiver = null;
         }
     }