Skip to content

Commit b2bb727

Browse files
Merge pull request #671 from TakayukiHoshi1984/bugfix_host_geolocation
Android10でChromeからGeolocationAPIが操作できない
2 parents ccf1261 + cc4badf commit b2bb727

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
2424
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
2525
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
26-
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
26+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
2727
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
2828
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
2929

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostGeolocationProfile.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public String getAttribute() {
7878
@Override
7979
public boolean onRequest(final Intent request, final Intent response) {
8080
PermissionUtility.requestPermissions(getContext(),
81-
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
81+
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION,
82+
Manifest.permission.ACCESS_COARSE_LOCATION},
8283
new PermissionUtility.PermissionRequestCallback() {
8384
@Override
8485
public void onSuccess() {
@@ -116,7 +117,8 @@ public String getAttribute() {
116117
@Override
117118
public boolean onRequest(final Intent request, final Intent response) {
118119
PermissionUtility.requestPermissions(getContext(),
119-
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
120+
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION,
121+
Manifest.permission.ACCESS_COARSE_LOCATION},
120122
new PermissionUtility.PermissionRequestCallback() {
121123
@Override
122124
public void onSuccess() {
@@ -159,7 +161,8 @@ public String getAttribute() {
159161
@Override
160162
public boolean onRequest(final Intent request, final Intent response) {
161163
PermissionUtility.requestPermissions(getContext(),
162-
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
164+
new Handler(Looper.getMainLooper()), new String[]{Manifest.permission.ACCESS_FINE_LOCATION,
165+
Manifest.permission.ACCESS_COARSE_LOCATION},
163166
new PermissionUtility.PermissionRequestCallback() {
164167
@Override
165168
public void onSuccess() {

dConnectManager/dConnectManager/dconnect-manager-app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<service
161161
android:name="org.deviceconnect.android.manager.DConnectService"
162162
android:exported="false"
163-
android:foregroundServiceType="mediaProjection">
163+
android:foregroundServiceType="mediaProjection|location">
164164
</service>
165165

166166
<!-- Webサーバを管理するサービス -->

0 commit comments

Comments
 (0)