Skip to content

Commit 5957e97

Browse files
masaru-takanomasaru-takano
committed
Merge remote-tracking branch 'origin/master' into bugfix_android_10_camera
2 parents 7ef3799 + ce3c1bb commit 5957e97

124 files changed

Lines changed: 1355 additions & 525 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
android {
1919

20-
compileSdkVersion 27
20+
compileSdkVersion 28
2121

2222
def getVersionName = { ->
2323
def version
@@ -33,7 +33,7 @@ android {
3333
defaultConfig {
3434
applicationId "org.deviceconnect.android.deviceplugin.wear"
3535
minSdkVersion 23
36-
targetSdkVersion 27
36+
targetSdkVersion 28
3737
versionCode 1
3838
versionName getVersionName()
3939
multiDexEnabled true

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
android:icon="@drawable/dconnect_icon"
1717
android:name="android.support.multidex.MultiDexApplication"
1818
android:label="@string/app_name"
19-
android:theme="@style/AppTheme">
19+
android:theme="@style/AppTheme"
20+
android:networkSecurityConfig="@xml/network_security_config">
2021

2122
<meta-data
2223
android:name="com.google.android.gms.version"

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/java/org/deviceconnect/android/deviceplugin/wear/WearManager.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ public void init() {
9898
getNodes(new OnNodeResultListener() {
9999
@Override
100100
public void onResult(final List<Node> results) {
101+
if (results == null) {
102+
return;
103+
}
101104
synchronized (mNodeCache) {
102105
for (Node node : results) {
103106
if (!mNodeCache.containsKey(node.getId())) {
@@ -121,6 +124,9 @@ public void run() {
121124
getNodes(new OnNodeResultListener() {
122125
@Override
123126
public void onResult(final List<Node> results) {
127+
if (results == null) {
128+
return;
129+
}
124130
synchronized (mNodeCache) {
125131
for (Node node : results) {
126132
if (!mNodeCache.containsKey(node.getId())) {

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/res/xml/network_security_config.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true" />
4+
</network-security-config>

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
22

33

44
android {
5-
compileSdkVersion 27
5+
compileSdkVersion 28
66
defaultConfig {
77
applicationId "org.deviceconnect.android.deviceplugin.wear"
88
minSdkVersion 23
9-
targetSdkVersion 27
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName '2.0.0'
1212
}

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
android:allowBackup="false"
1515
android:icon="@drawable/dconnect_icon"
1616
android:label="@string/app_name"
17-
android:theme="@android:style/Theme.DeviceDefault">
17+
android:theme="@android:style/Theme.DeviceDefault"
18+
android:networkSecurityConfig="@xml/network_security_config">
1819
<meta-data
1920
android:name="com.google.android.wearable.standalone"
2021
android:value="false" />

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/src/main/res/xml/network_security_config.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true" />
4+
</network-security-config>

‎dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
android:name=".ChromeCastApplication"
1515
android:icon="@drawable/ic_launcher"
1616
android:label="@string/app_name"
17-
android:theme="@style/AppCompatCustom">
17+
android:theme="@style/AppCompatCustom"
18+
android:networkSecurityConfig="@xml/network_security_config">
1819

1920

2021
<!-- 設定画面 -->

‎dConnectDevicePlugin/dConnectDeviceChromeCast/app/src/main/res/xml/network_security_config.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true" />
4+
</network-security-config>

‎dConnectDevicePlugin/dConnectDeviceFaBo/plugin/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="org.deviceconnect.android.deviceplugin.fabo">
2+
xmlns:tools="http://schemas.android.com/tools"
3+
package="org.deviceconnect.android.deviceplugin.fabo">
34

45
<uses-feature android:name="android.hardware.usb.host"/>
56

@@ -8,7 +9,8 @@
89
android:icon="@drawable/dconnect_icon"
910
android:label="@string/app_name"
1011
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
12+
android:theme="@style/AppTheme"
13+
tools:replace="android:allowBackup">
1214

1315
<!-- Device Connect Example Device Plugin Provider. -->
1416
<receiver android:name="org.deviceconnect.android.deviceplugin.fabo.FaBoArduinoDeviceProvider">

0 commit comments

Comments
 (0)