Merge branch 'android-12'

AltBeacon · Aug 8, 2021 · 6ea2fe2 · 6ea2fe2
2 parents bf87639 + a61d049
commit 6ea2fe2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <application>
-        <receiver android:name="org.altbeacon.beacon.startup.StartupBroadcastReceiver">
+        <receiver android:name="org.altbeacon.beacon.startup.StartupBroadcastReceiver" android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
                 <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>

diff --git a/lib/src/main/java/org/altbeacon/beacon/BeaconParser.java b/lib/src/main/java/org/altbeacon/beacon/BeaconParser.java
@@ -672,7 +672,12 @@ else if (endIndex > pduToParse.getEndIndex() && !mAllowPduOverflow) {
             String name = null;
             if (device != null) {
                 macAddress = device.getAddress();
-                name = device.getName();
+                try {
+                  name = device.getName();
+                }
+                catch (SecurityException e) {
+                  Log.d(TAG,"Cannot read device name without Manifest.permission.BLUETOOTH_CONNECT");
+                }
             }
 
             beacon.mIdentifiers = identifiers;

diff --git a/lib/src/main/java/org/altbeacon/beacon/service/BeaconService.java b/lib/src/main/java/org/altbeacon/beacon/service/BeaconService.java
@@ -64,6 +64,7 @@
 import java.util.List;
 
 import static android.app.PendingIntent.FLAG_ONE_SHOT;
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
 import static android.app.PendingIntent.getBroadcast;
 
 /**
@@ -358,7 +359,7 @@ public void onTaskRemoved(Intent rootIntent) {
 
     private PendingIntent getRestartIntent() {
         Intent restartIntent = new Intent(getApplicationContext(), StartupBroadcastReceiver.class);
-        return getBroadcast(getApplicationContext(), 1, restartIntent, FLAG_ONE_SHOT);
+        return getBroadcast(getApplicationContext(), 1, restartIntent, FLAG_ONE_SHOT | FLAG_IMMUTABLE);
     }
 
     /**

diff --git a/lib/src/main/java/org/altbeacon/beacon/service/ScanHelper.java b/lib/src/main/java/org/altbeacon/beacon/service/ScanHelper.java
@@ -257,7 +257,7 @@ void stopAndroidOBackgroundScan() {
     PendingIntent getScanCallbackIntent() {
         Intent intent = new Intent(mContext, StartupBroadcastReceiver.class);
         intent.putExtra("o-scan", true);
-        return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     private final CycledLeScanCallback mCycledLeScanCallback = new CycledLeScanCallback() {

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
@@ -526,7 +526,7 @@ protected PendingIntent getWakeUpOperation() {
         if (mWakeUpOperation == null) {
             Intent wakeupIntent = new Intent(mContext, StartupBroadcastReceiver.class);
             wakeupIntent.putExtra("wakeup", true);
-            mWakeUpOperation = PendingIntent.getBroadcast(mContext, 0, wakeupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            mWakeUpOperation = PendingIntent.getBroadcast(mContext, 0, wakeupIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         }
         return mWakeUpOperation;
     }

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
@@ -260,7 +260,7 @@ public void run() {
                     LogManager.e(npe, TAG, "Cannot start scan. Unexpected NPE.");
                 } catch (SecurityException e) {
                     // Thrown by Samsung Knox devices if bluetooth access denied for an app
-                    LogManager.e(TAG, "Cannot start scan.  Security Exception");
+                    LogManager.e(TAG, "Cannot start scan.  Security Exception: "+e.getMessage(), e);
                 }
 
             }
@@ -292,7 +292,7 @@ public void run() {
                     LogManager.e(npe, TAG, "Cannot stop scan. Unexpected NPE.");
                 } catch (SecurityException e) {
                     // Thrown by Samsung Knox devices if bluetooth access denied for an app
-                    LogManager.e(TAG, "Cannot stop scan.  Security Exception");
+                    LogManager.e(TAG, "Cannot stop scan.  Security Exception", e);
                 }
 
             }
@@ -308,7 +308,7 @@ private boolean isBluetoothOn() {
             LogManager.w(TAG, "Cannot get bluetooth adapter");
         }
         catch (SecurityException e) {
-            LogManager.w(TAG, "SecurityException checking if bluetooth is on");
+            LogManager.w(TAG, "SecurityException checking if bluetooth is on", e);
         }
         return false;
     }
@@ -327,7 +327,7 @@ private BluetoothLeScanner getScanner() {
             }
         }
         catch (SecurityException e) {
-            LogManager.w(TAG, "SecurityException making new Android L scanner");
+            LogManager.w(TAG, "SecurityException making new Android L scanner", e);
         }
         return mScanner;
     }

diff --git a/lib/src/main/java/org/altbeacon/bluetooth/BluetoothMedic.java b/lib/src/main/java/org/altbeacon/bluetooth/BluetoothMedic.java
@@ -448,7 +448,7 @@ private void sendScreenNotification(String message, String detail) {
 
             PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(
                     0,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
             );
             builder.setContentIntent(resultPendingIntent);
             NotificationManager notificationManager =