Skip to content

Commit 4ea247a

Browse files
Merge pull request #567 from TakayukiHoshi1984/modify_chrome_92
Chrome92対応
2 parents 5cd06a2 + 0832b8b commit 4ea247a

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

  • dConnectManager/dConnectManager
    • dconnect-manager-app/src/main/assets/html
    • dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core/policy

dConnectManager/dConnectManager/dconnect-manager-app/src/main/assets/html/demo/js/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var util = (function(parent, global) {
5858
dConnect.setHost(mHost);
5959
dConnect.setPort(mPort);
6060
dConnect.setSSLEnabled(mSSLEnabled);
61-
dConnect.setExtendedOrigin("file://");
61+
dConnect.setExtendedOrigin("null");
6262
checkDeviceConnect(callback);
6363
}
6464
parent.init = init;

dConnectManager/dConnectManager/dconnect-manager-app/src/main/assets/html/help/tutorial/demo/js/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var util = (function(parent, global) {
77

88
function init(callback) {
99
dConnect.setHost("localhost");
10-
dConnect.setExtendedOrigin("file://");
10+
dConnect.setExtendedOrigin("null");
1111
dConnect.setSSLEnabled(mSSLEnabled);
1212
checkDeviceConnect(callback);
1313
}

dConnectManager/dConnectManager/dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core/policy/OriginValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public final class OriginValidator {
1212
/** fileスキームのオリジン. */
13-
private static final String ORIGIN_FILE = "file://";
13+
private static final String ORIGIN_FILE = "null";
1414

1515
/** 常に許可するオリジン一覧. */
1616
private static final String[] IGNORED_ORIGINS = {ORIGIN_FILE};

0 commit comments

Comments
 (0)