Skip to content

Commit f5f33cf

Browse files
committed
Add Package names to intents for lockScreen
1 parent 25256ba commit f5f33cf

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ public void start(CompletionListener listener) {
135135
public void dispose() {
136136
// send broadcast to close lock screen if open
137137
if (context.get() != null) {
138-
context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
138+
Intent intent = new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION)
139+
.setPackage(context.get().getPackageName());
140+
context.get().sendBroadcast(intent);
139141
try {
140142
context.get().unregisterReceiver(mLockscreenDismissedReceiver);
141143
lockscreenDismissReceiverRegistered = false;
@@ -335,7 +337,7 @@ private void launchLockScreenActivity() {
335337
if (isLockscreenDismissible && !lockscreenDismissReceiverRegistered) {
336338
AndroidTools.registerReceiver(context.get(), mLockscreenDismissedReceiver,
337339
new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED),
338-
Context.RECEIVER_EXPORTED);
340+
Context.RECEIVER_NOT_EXPORTED);
339341
lockscreenDismissReceiverRegistered = true;
340342

341343
}
@@ -431,6 +433,7 @@ public void onImageRetrieved(Bitmap icon) {
431433
intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
432434
intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
433435
if (context.get() != null) {
436+
intent.setPackage(context.get().getPackageName());
434437
context.get().sendBroadcast(intent);
435438
}
436439
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
108108

109109
// register broadcast receivers
110110
AndroidTools.registerReceiver(this, lockScreenBroadcastReceiver, lockscreenFilter,
111-
RECEIVER_EXPORTED);
111+
RECEIVER_NOT_EXPORTED);
112112
}
113113

114114
@Override
@@ -286,7 +286,9 @@ private class SwipeUpGestureListener extends GestureDetector.SimpleOnGestureList
286286
public boolean onFling(MotionEvent event1, MotionEvent event2,
287287
float velocityX, float velocityY) {
288288
if ((event2.getY() - event1.getY()) > MIN_SWIPE_DISTANCE) {
289-
sendBroadcast(new Intent(KEY_LOCKSCREEN_DISMISSED));
289+
Intent intent = new Intent(KEY_LOCKSCREEN_DISMISSED)
290+
.setPackage(getPackageName());
291+
sendBroadcast(intent);
290292
finish();
291293
}
292294
return true;

0 commit comments

Comments
 (0)