summaryrefslogtreecommitdiff
path: root/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java')
-rwxr-xr-xandroid/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
index 4761c15c4..8497e3b73 100755
--- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
@@ -25,15 +25,13 @@ public class MainActivity extends AppCompatActivity {
if (BuildConfig.TRANSPORT.equals("MULTI") || BuildConfig.TRANSPORT.equals("MULTI_HB")) {
- if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- if (!checkPermission()) {
- requestPermission();
- }
- } else if (BuildConfig.TRANSPORT.equals("TCP")){
- //If we are connected to a module we want to start our SdlService
- SdlReceiver.queryForConnectedService(this);
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !checkPermission()) {
+ requestPermission();
+ return;
}
- } else {
+ //If we are connected to a module we want to start our SdlService
+ SdlReceiver.queryForConnectedService(this);
+ } else if (BuildConfig.TRANSPORT.equals("TCP")){
Intent proxyIntent = new Intent(this, SdlService.class);
startService(proxyIntent);
}