diff options
| author | Joey Grover <joeygrover@gmail.com> | 2020-10-01 11:43:33 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2020-10-01 11:43:33 -0400 |
| commit | 32f6ef485af63d9641dc445ee832b0db24417b13 (patch) | |
| tree | 7fa4429aeb47c0135a9f46158d2d35d245fd930d | |
| parent | e4b6c396a0a7982add2971c5ac8b3dea947ecf7d (diff) | |
| download | sdl_android-32f6ef485af63d9641dc445ee832b0db24417b13.tar.gz | |
Combine bools for lockscreen dismiss extra
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java index e36c2f281..ae6ee79cc 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java @@ -325,7 +325,7 @@ public class LockScreenManager extends BaseSubManager { showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_CUSTOM_VIEW_EXTRA, customView); showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled); showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo); - showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSIBLE, isLockscreenDismissible); + showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSIBLE, isLockscreenDismissible && enableDismissGesture); showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_WARNING_MSG, mLockscreenWarningMsg); if (lastIntentUsed != null && lastIntentUsed.equals(showLockScreenIntent.toUri(0))) { |