Merge branch 'develop' into bugfix/issue_1859_foreground_service_type

# Conflicts:
#	android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java

Author: JulianKast

android/hello_sdl_android/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     defaultConfig {
         applicationId "com.sdl.hellosdlandroid"
         minSdkVersion 16
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         resValue "string", "app_name", "Hello Sdl Android"

android/sdl_android/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 25
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'

android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java

@@ -56,6 +56,7 @@
 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
+import com.smartdevicelink.util.AndroidTools;
 import com.smartdevicelink.util.DebugTool;
 
 import java.lang.ref.WeakReference;
@@ -134,7 +135,9 @@ public void start(CompletionListener listener) {
     public void dispose() {
         // send broadcast to close lock screen if open
         if (context.get() != null) {
-            context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
+            Intent intent = new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION)
+                    .setPackage(context.get().getPackageName());
+            context.get().sendBroadcast(intent);
             try {
                 context.get().unregisterReceiver(mLockscreenDismissedReceiver);
                 lockscreenDismissReceiverRegistered = false;
@@ -332,7 +335,9 @@ private void launchLockScreenActivity() {
             // pass in icon, background color, and custom view
             if (lockScreenEnabled && isApplicationForegrounded && context.get() != null) {
                 if (isLockscreenDismissible && !lockscreenDismissReceiverRegistered) {
-                    context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED));
+                    AndroidTools.registerReceiver(context.get(), mLockscreenDismissedReceiver,
+                            new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED),
+                            Context.RECEIVER_NOT_EXPORTED);
                     lockscreenDismissReceiverRegistered = true;
 
                 }
@@ -373,7 +378,9 @@ private void closeLockScreenActivity() {
         if (context.get() != null) {
             LockScreenStatus status = getLockScreenStatus();
             if (status == LockScreenStatus.OFF || (status == LockScreenStatus.OPTIONAL && displayMode != LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED)) {
-                context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
+                Intent intent = new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION)
+                        .setPackage(context.get().getPackageName());
+                context.get().sendBroadcast(intent);
             }
         }
         lastIntentUsed = null;
@@ -428,6 +435,7 @@ public void onImageRetrieved(Bitmap icon) {
                             intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
                             intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
                             if (context.get() != null) {
+                                intent.setPackage(context.get().getPackageName());
                                 context.get().sendBroadcast(intent);
                             }
                         }

android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java

@@ -52,6 +52,7 @@
 import android.widget.TextView;
 
 import com.smartdevicelink.R;
+import com.smartdevicelink.util.AndroidTools;
 
 public class SDLLockScreenActivity extends Activity {
 
@@ -106,7 +107,8 @@ protected void onCreate(Bundle savedInstanceState) {
         lockscreenFilter.addAction(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
 
         // register broadcast receivers
-        registerReceiver(lockScreenBroadcastReceiver, lockscreenFilter);
+        AndroidTools.registerReceiver(this, lockScreenBroadcastReceiver, lockscreenFilter,
+                RECEIVER_NOT_EXPORTED);
     }
 
     @Override
@@ -284,7 +286,9 @@ private class SwipeUpGestureListener extends GestureDetector.SimpleOnGestureList
         public boolean onFling(MotionEvent event1, MotionEvent event2,
                                float velocityX, float velocityY) {
             if ((event2.getY() - event1.getY()) > MIN_SWIPE_DISTANCE) {
-                sendBroadcast(new Intent(KEY_LOCKSCREEN_DISMISSED));
+                Intent intent = new Intent(KEY_LOCKSCREEN_DISMISSED)
+                        .setPackage(getPackageName());
+                sendBroadcast(intent);
                 finish();
             }
             return true;

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -1242,7 +1242,7 @@ public void startUpSequence() {
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(REGISTER_WITH_ROUTER_ACTION);
-        registerReceiver(mainServiceReceiver, filter);
+        AndroidTools.registerReceiver(this, mainServiceReceiver, filter, RECEIVER_EXPORTED);
 
         if (!connectAsClient) {
             if (bluetoothAvailable()) {
@@ -1890,6 +1890,7 @@ public void onTransportConnected(final TransportRecord record) {
             //the developer can use this pendingIntent to start their SdlService from the context of
             //the active RouterService
             Intent pending = new Intent();
+            pending.setPackage(getPackageName());
             PendingIntent pendingIntent = PendingIntent.getForegroundService(this, (int) System.currentTimeMillis(), pending, PendingIntent.FLAG_MUTABLE | Intent.FILL_IN_COMPONENT);
             startService.putExtra(TransportConstants.PENDING_INTENT_EXTRA, pendingIntent);
         }
@@ -3013,6 +3014,7 @@ private Intent createPingIntent() {
             //the developer can use this pendingIntent to start their SdlService from the context of
             //the active RouterService
             Intent pending = new Intent();
+            pending.setPackage(getPackageName());
             PendingIntent pendingIntent = PendingIntent.getForegroundService(this, (int) System.currentTimeMillis(), pending, PendingIntent.FLAG_MUTABLE | Intent.FILL_IN_COMPONENT);
             pingIntent.putExtra(TransportConstants.PENDING_INTENT_EXTRA, pendingIntent);
         }

android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java

@@ -50,6 +50,7 @@
 import com.smartdevicelink.transport.enums.TransportType;
 import com.smartdevicelink.transport.utl.SdlDeviceListener;
 import com.smartdevicelink.transport.utl.TransportRecord;
+import com.smartdevicelink.util.AndroidTools;
 import com.smartdevicelink.util.DebugTool;
 
 import java.lang.ref.WeakReference;
@@ -412,7 +413,8 @@ synchronized void enterLegacyMode(final String info) {
                 IntentFilter intentFilter = new IntentFilter();
                 intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
                 intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-                contextWeakReference.get().registerReceiver(legacyDisconnectReceiver, intentFilter);
+                AndroidTools.registerReceiver(contextWeakReference.get(),
+                        legacyDisconnectReceiver, intentFilter, Context.RECEIVER_EXPORTED);
             }
         } else {
             new Handler(Looper.myLooper()).postDelayed(new Runnable() {

android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java

@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.util;
 
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
 import android.Manifest;
 import android.content.ComponentName;
 import android.content.Context;
@@ -397,6 +399,29 @@ public static void saveVehicleType(Context context, VehicleType vehicleType, Str
         }
     }
 
+    /**
+     * A helper method to handle adding flags to registering a run time broadcast receiver.
+     *
+     * @param context  a context that will be used to register the receiver with
+     * @param receiver the receiver that will be registered
+     * @param filter   the filter that will be use to filter intents sent to the broadcast receiver
+     * @param flags    any flags that should be used to register the receiver. In most cases this
+     *                 will be {@link  Context#RECEIVER_NOT_EXPORTED} or
+     *                 {@link  Context#RECEIVER_EXPORTED}
+     * @see Context#registerReceiver(BroadcastReceiver, IntentFilter)
+     * @see Context#registerReceiver(BroadcastReceiver, IntentFilter, int)
+     */
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+    public static void registerReceiver(Context context, BroadcastReceiver receiver, IntentFilter filter, int flags) {
+        if (context != null && receiver != null && filter != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.registerReceiver(receiver, filter, flags);
+            } else {
+                context.registerReceiver(receiver, filter);
+            }
+        }
+    }
+
     /**
      * A helper method is used to see if this app has permission for UsbAccessory.
      * We need UsbAccessory permission if we are plugged in via AOA and do not have BLUETOOTH_CONNECT

android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java

@@ -261,8 +261,8 @@ private void updateBroadcastReceiver() {
             }
             unregisterBroadcastReceiver();
             //Re-register receiver
-            context.registerReceiver(broadcastReceiver, intentFilter);
-
+            AndroidTools.registerReceiver(context, broadcastReceiver, intentFilter,
+                    Context.RECEIVER_EXPORTED);
         }
 
     }

android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java

@@ -74,7 +74,8 @@ public ServiceFinder(Context context, String packageName, final ServiceFinderCal
 
         this.sdlMultiMap = AndroidTools.getSdlEnabledApps(context, packageName);
 
-        this.context.registerReceiver(mainServiceReceiver, new IntentFilter(this.receiverLocation));
+        AndroidTools.registerReceiver(this.context, mainServiceReceiver,
+                new IntentFilter(this.receiverLocation), Context.RECEIVER_EXPORTED);
 
         timeoutRunnable = new Runnable() {
             @Override