Skip to content

Commit 1485628

Browse files
committed
From review - do not export broadcast receivers in LockScreenManager and SDLLockScreenActivity
1 parent 060e414 commit 1485628

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
5858
import com.smartdevicelink.proxy.rpc.enums.RequestType;
5959
import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
60+
import com.smartdevicelink.util.AndroidTools;
6061
import com.smartdevicelink.util.DebugTool;
6162

6263
import java.lang.ref.WeakReference;
@@ -333,11 +334,9 @@ private void launchLockScreenActivity() {
333334
// pass in icon, background color, and custom view
334335
if (lockScreenEnabled && isApplicationForegrounded && context.get() != null) {
335336
if (isLockscreenDismissible && !lockscreenDismissReceiverRegistered) {
336-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
337-
context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED), Context.RECEIVER_EXPORTED);
338-
} else {
339-
context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED));
340-
}
337+
AndroidTools.registerReceiver(context.get(), mLockscreenDismissedReceiver,
338+
new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED),
339+
Context.RECEIVER_NOT_EXPORTED);
341340
lockscreenDismissReceiverRegistered = true;
342341
}
343342
LockScreenStatus status = getLockScreenStatus();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import android.widget.TextView;
5454

5555
import com.smartdevicelink.R;
56+
import com.smartdevicelink.util.AndroidTools;
5657

5758
public class SDLLockScreenActivity extends Activity {
5859

@@ -106,11 +107,8 @@ protected void onCreate(Bundle savedInstanceState) {
106107
lockscreenFilter.addAction(CLOSE_LOCK_SCREEN_ACTION);
107108
lockscreenFilter.addAction(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
108109
// register broadcast receivers
109-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
110-
registerReceiver(lockScreenBroadcastReceiver, lockscreenFilter, RECEIVER_EXPORTED);
111-
} else {
112-
registerReceiver(lockScreenBroadcastReceiver, lockscreenFilter);
113-
}
110+
AndroidTools.registerReceiver(this, lockScreenBroadcastReceiver, lockscreenFilter,
111+
RECEIVER_NOT_EXPORTED);
114112
}
115113

116114
@Override

0 commit comments

Comments
 (0)