Skip to content

Linkingのビーコン検索サービスの開始処理の修正 #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakayukiHoshi1984 merged 2 commits into from
Jan 22, 2020
Merged

Linkingのビーコン検索サービスの開始処理の修正 #485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05dd4f9
Merge pull request #652 from TakayukiHoshi1984/bugfix_rtsp_closure
masaru-takano Jan 8, 2020
4f8b21e
Linkingのビーコン検索サービスの開始処理の修正
TakayukiHoshi1984 Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...main/java/org/deviceconnect/android/deviceplugin/linking/beacon/LinkingBeaconManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.util.Log;

import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
Expand Down Expand Up @@ -315,7 +316,11 @@ private void startBeaconScanInternal(final LinkingBeaconUtil.ScanMode scanMode)
if (scanMode != null) {
intent.putExtra(mContext.getPackageName() + LinkingBeaconUtil.EXTRA_SCAN_MODE, scanMode.getValue());
}
mContext.startService(intent);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mContext.startForegroundService(intent);
} else {
mContext.startService(intent);
}
}

private void stopBeaconScanInternal() {
Expand All @@ -326,7 +331,11 @@ private void stopBeaconScanInternal() {
Intent intent = new Intent();
intent.setClassName(LinkingBeaconUtil.LINKING_PACKAGE_NAME, LinkingBeaconUtil.BEACON_SERVICE_NAME);
intent.setAction(mContext.getPackageName() + LinkingBeaconUtil.ACTION_STOP_BEACON_SCAN);
mContext.startService(intent);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mContext.startForegroundService(intent);
} else {
mContext.startService(intent);
}
}

private void parseBeaconScanState(final Intent intent) {
Expand Down