Adjusting phone apps with the latest Android studio and Android 7; adjusting Spruce...

diff --git a/benchmarks/drivers/Java/Makefile b/benchmarks/drivers/Java/Makefile
index 89ee2fc677deb4f2459b73c3bf1282d13b9e6c36..5cb630bcda97bc7943c4cff29486fa070084328c 100644 (file)
--- a/benchmarks/drivers/Java/Makefile
+++ b/benchmarks/drivers/Java/Makefile
@@ -16,8 +16,8 @@ CHECKER_OPT = -processor iotchecker.IoTJavaChecker -AprintErrorStack
 
 ASTUBS = -Astubs=../../../checker/astubs/ 
 
-all: light camera labroom greenlawn sprinkler moisture weathergateway audioroom gpsgateway ihome homeroom alarm motion multipurpose waterleak doorlock doorlockactuator
-check-all: check-light check-camera check-labroom check-greenlawn check-sprinkler check-moisture check-weathergateway check-audioroom check-gpsgateway check-ihome check-homeroom check-alarm check-motion check-multipurpose check-waterleak check-doorlock check-doorlockactuator
+all: light camera labroom greenlawn sprinkler blossomsprinkler moisture weathergateway audioroom gpsgateway ihome homeroom alarm motion multipurpose waterleak doorlock doorlockactuator
+check-all: check-light check-camera check-labroom check-greenlawn check-sprinkler check-blossomsprinkler check-moisture check-weathergateway check-audioroom check-gpsgateway check-ihome check-homeroom check-alarm check-motion check-multipurpose check-waterleak check-doorlock check-doorlockactuator
 
 # Compile - without checker
 #

diff --git a/benchmarks/drivers/Java/SpruceSensor/SpruceSensor.java b/benchmarks/drivers/Java/SpruceSensor/SpruceSensor.java
index e0511234165a31cb5112de872b8eac213fe0fd8c..d0b0f11ce4bf1e898b4770e769ea050e7f6d144e 100644 (file)
--- a/benchmarks/drivers/Java/SpruceSensor/SpruceSensor.java
+++ b/benchmarks/drivers/Java/SpruceSensor/SpruceSensor.java
@@ -80,6 +80,7 @@ public class SpruceSensor implements IoTZigbeeCallback, MoistureSensor {
                        while (!didBind.get()) {
                                zigConnection.sendBindRequest(0x0001, 0x0405, 0x01);
                                try {
+                                   System.out.println("Sending bind request!");
                                        Thread.sleep(TIMEOUT_FOR_RESEND_MSEC);
                                } catch (Exception e) {
                                        e.printStackTrace();

diff --git a/benchmarks/other/PhoneInterface/Control/.idea/misc.xml b/benchmarks/other/PhoneInterface/Control/.idea/misc.xml
index 5d19981032aa01b060f5a568641d7a8840cc90dc..ba7052b8197ddf8ba8756022d905d03055c7ad60 100644 (file)
--- a/benchmarks/other/PhoneInterface/Control/.idea/misc.xml
+++ b/benchmarks/other/PhoneInterface/Control/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/benchmarks/other/PhoneInterface/Control/app/build.gradle b/benchmarks/other/PhoneInterface/Control/app/build.gradle
index f6863e59c17ce4fe6b1ec2788f171e5ef99b886c..aa12c7f6c3501be89e652245beb9ffa8b5472d0c 100644 (file)
--- a/benchmarks/other/PhoneInterface/Control/app/build.gradle
+++ b/benchmarks/other/PhoneInterface/Control/app/build.gradle
@@ -7,8 +7,8 @@ android {
     }
 
 
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.example.ali.control"

diff --git a/benchmarks/other/PhoneInterface/Control/build.gradle b/benchmarks/other/PhoneInterface/Control/build.gradle
index 90a4bba02b8fa8ba959e4344494c24a6c6b44a76..fda248f4933fc39af3ef23d7e6e93dc7fe8e2934 100644 (file)
--- a/benchmarks/other/PhoneInterface/Control/build.gradle
+++ b/benchmarks/other/PhoneInterface/Control/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/benchmarks/other/PhoneInterface/Control/gradle/wrapper/gradle-wrapper.properties b/benchmarks/other/PhoneInterface/Control/gradle/wrapper/gradle-wrapper.properties
index 32498ebc41134b25ebfcad84a5edf09101daab19..17ff9467e717fff029735ce0b5acc79c8bb5123c 100644 (file)
--- a/benchmarks/other/PhoneInterface/Control/gradle/wrapper/gradle-wrapper.properties
+++ b/benchmarks/other/PhoneInterface/Control/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 12 20:24:22 PDT 2017
+#Thu Mar 01 15:03:06 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/build.gradle b/benchmarks/other/PhoneInterface/Irrigation/app/build.gradle
index e2e81f4b9e9310d21d4999717ea207ab844de402..2ad49cff7632595a4a259d6229cbaa10853f3b23 100644 (file)
--- a/benchmarks/other/PhoneInterface/Irrigation/app/build.gradle
+++ b/benchmarks/other/PhoneInterface/Irrigation/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     useLibrary 'org.apache.http.legacy'
     defaultConfig {
         applicationId "com.example.xubin.irrigation"

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.108.pem b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.108.pem
deleted file mode 100644 (file)
index d038f8a..0000000
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.108.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAJEv9gf3BRGPMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UEBwwGSXJ2aW5lMQwwCgYDVQQKDANV
-Q0kxDTALBgNVBAsMBEVFQ1MxFjAUBgNVBAMMDTE5Mi4xNjguMi4xMDgwHhcNMTYw
-NTE2MjAzOTIzWhcNMTcwNTExMjAzOTIzWjBgMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCQ0ExDzANBgNVBAcMBklydmluZTEMMAoGA1UECgwDVUNJMQ0wCwYDVQQLDARF
-RUNTMRYwFAYDVQQDDA0xOTIuMTY4LjIuMTA4MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA5azgPSycemBypBji0+dMvGUku8bCNxOI5t9rg3eTuDo/Sy1N
-nQD58jluSsUWf74bBAayZjn0i0lnRWggKXqLJiPLXY1kXxV0TT0+SEynSNC408PV
-8hZVYMd7pk6TqZw3MvDm2oHOKmpKW1bTBuNz6xpJhskckLyGM1QAQD9rvNrZII5a
-knINejARv3aKRvSRkNaunulXJztY2kOJnpXlO+HvTG8+Dzr8BTKiVU7wu1RwWtUP
-ha93eV+g0pbiJ/QUQ9mBScG1+iswOVA1HWnwEpV3GDJltGf1WTN4YsKRrXnfzwRf
-gAmTI9SU6KugddHMCTD+/DBn4X4SPxAVc+eqywIDAQABo1AwTjAdBgNVHQ4EFgQU
-oAvtU2TVp1KXB1ugGXIdt5zwmJcwHwYDVR0jBBgwFoAUoAvtU2TVp1KXB1ugGXId
-t5zwmJcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbPa1JIGxmJmd
-LQ3cM/nfLWn4BjkUFW7VSlsheL8zxt69uK6diwe3JFPNMHc4ZPey3N9KnlR5v/ax
-qCVi4cdm9wA+20uRV3ay6FXNuCTK1YFpFfAJ8c/ZVX4megKLcnb1QHOiYRJIjUp+
-jr36Qvewf/bpRxHZMkmNGx2rQWRUPUUxOlT8mQnxQk+28/FlSLtSRPDNhfnHTahT
-ujICes4XEq5/1fMhZKsjGo5JwzHp9KBg/RS1g7Q+gigPZZXCL8ml4pVBt3LYUGEA
-7GQoNEL6eXkSvv5jzMwVUwniZmDL6VoHWMZtAHRlFsjT/KRGWBx05shBk2zRuloT
-a9vK41EiSw==
------END CERTIFICATE-----

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.191.pem b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.191.pem
deleted file mode 100644 (file)
index 02dcba6..0000000
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.191.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAMzNAyNJVyYjMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UEBwwGSXJ2aW5lMQwwCgYDVQQKDANV
-Q0kxDTALBgNVBAsMBEVFQ1MxFjAUBgNVBAMMDTE5Mi4xNjguMi4xOTEwHhcNMTYw
-NTE3MTY0NTIzWhcNMTcwNTEyMTY0NTIzWjBgMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCQ0ExDzANBgNVBAcMBklydmluZTEMMAoGA1UECgwDVUNJMQ0wCwYDVQQLDARF
-RUNTMRYwFAYDVQQDDA0xOTIuMTY4LjIuMTkxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAwC8c83mhdfluocrTG2tMvwPR6GDiPuDLBAl1nHgmdttHdn1+
-IzaFoeXYa/96DROt7Sq5FiTao1zDsKuIoBulgmmlqwHbCdkbmA2nyk9on9g3KEGm
-Q9K6r1IX4gwDnD050uPu3OE6ygDmActgHnlUc65NEgHOCZDztN+TIGCBDVYcAmqH
-Ill0oPu2nsHpZBeRc0QoWW9cMBbyt5fFlIsYAV3BZjjU1UBx09R4etPLsO0V6+oV
-UT/Vgq11/V5yPwsQdPw5PCFuwnzBeGEKmkPXtgrxZCwD0m9nCrezaALGAtXaI+yk
-GkH2KbTDe1lizmL21IsFP1nFY28ux3reZ1obmQIDAQABo1AwTjAdBgNVHQ4EFgQU
-O3aAOMYwJ33gMwC1TxpJkj8NU/4wHwYDVR0jBBgwFoAUO3aAOMYwJ33gMwC1TxpJ
-kj8NU/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEJpPABRerq90
-rZKaI5aYR71j2zlzTmp0GpJ/SmuAXrn83m0B9JOVIK7sAVY99ugjWS+eJtjmDAJc
-bb38OFu0hjH9U6W6TVTzNVVt5L6IMH6gMZTEVY61Yze3t+RHFXk2ggrxAgHnNVlo
-M5r9Thw427UwHN2P+Du6guEurCJmT3Rw9rDYtHBjuef3Q6KjzuzGwsvLw+pRS5F0
-jlFQgtINvfoZlHmQvy+6jEQe7lyp1nmJPNH421CPpYrfflsIeuG35rHbH0IQ1NNv
-aEzUbbvc0CKgIqEj9Spk3YFGMv7BZIcBviy3Jn7VWt57Xexm9hCEkzpkSiWAh/jB
-YMuEz6aLJw==
------END CERTIFICATE-----

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.192.pem b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.192.pem
deleted file mode 100644 (file)
index cfac11c..0000000
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.192.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAKtV1MPWFk4tMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UEBwwGSXJ2aW5lMQwwCgYDVQQKDANV
-Q0kxDTALBgNVBAsMBEVFQ1MxFjAUBgNVBAMMDTE5Mi4xNjguMi4xOTIwHhcNMTYw
-NTE3MTY1NjE4WhcNMTcwNTEyMTY1NjE4WjBgMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCQ0ExDzANBgNVBAcMBklydmluZTEMMAoGA1UECgwDVUNJMQ0wCwYDVQQLDARF
-RUNTMRYwFAYDVQQDDA0xOTIuMTY4LjIuMTkyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAyRi5B1CRo2kVBxJOA+Z1PRqw/yeh7zU8x7Pak5Vg2T56hd12
-iUk3V2IrgWh5PYdhrs8ucf17gmsjA+k/kF2GIkzZVNKEakWg1ggqeUbWr/aRP0oO
-10uUss4bcbghVoAKrJYZqJ7TjmQZWTcCFzpNzmAFWpcizVbQWF42p3tc7f3zsPk9
-rTOCTj6W2TJWCRHABkYfEExtf7T+JxG1cI/bY7YD/xLCtwykSBYrzDR0gtDxu7OD
-in38jO++kTEhkbjUtxnwBzz1bjaiGIBMqt5sufODWqaU5QekFZQz5Ru04gBYRcd+
-jnHEI6SqAY8MkWtp7fo/vYxTK7iuflkbqBkFkQIDAQABo1AwTjAdBgNVHQ4EFgQU
-/6CKy031CDWH+lrKn3BtHU+v2O0wHwYDVR0jBBgwFoAU/6CKy031CDWH+lrKn3Bt
-HU+v2O0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAkDQVG+AvrmBI
-JGIGuAarNH/QeA7s4KI3B2BGvvSOOb9is1OuKrJ8TubTiEvbe9aGiKcqsZyt1abu
-DvQ5GZh9m2aRIGb3ByDg5Qk8iipA/oIuFWexiqa8IoFS2cFu+4nM0CHsQBpdMRNX
-tPWvV2CvQuzJRlALSucv4KOenzZmiiHBzBy1Bnbo6UFXl5DgYbOB+Mg82BlqenY5
-C2PpTEsrDmyy0A4IOnPQW9iRaNV7yC2i8T1bbFpSd95f64egb92hzGjf8os1r/5A
-OpOccHlP6zFQ7MFCVcUzhKjrVrHFtj89Evag7KwVqFpMIwqRga9DtIaJlxYszPPn
-m8woeEp1mA==
------END CERTIFICATE-----

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.244.pem b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.244.pem
deleted file mode 100644 (file)
index cc471f9..0000000
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/assets/192.168.2.244.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAJIi1p3z84ZfMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UEBwwGSXJ2aW5lMQwwCgYDVQQKDANV
-Q0kxDTALBgNVBAsMBEVFQ1MxFjAUBgNVBAMMDTE5Mi4xNjguMi4yNDQwHhcNMTYw
-NTE3MTY1ODQxWhcNMTcwNTEyMTY1ODQxWjBgMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCQ0ExDzANBgNVBAcMBklydmluZTEMMAoGA1UECgwDVUNJMQ0wCwYDVQQLDARF
-RUNTMRYwFAYDVQQDDA0xOTIuMTY4LjIuMjQ0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA36ufE9vlUNViOL24BSXGYjPrJMz0og55KFP+r9Z7QTz3uXuP
-onTkHb4zwnjT7lDfe6Fc0h8mwLsXrgzRGnEa31ywrJS5U1GDN9dlO2x6IO0E5xd6
-wEE+47qSxZ2Kv8f1UfJWgi7Wtla6tkjBqq+Gwj8qodO82km+vkHgqbsEtfFoUlvm
-KUfXdEkdigsSwxl2duCvZvDGWQ1j5k+Pr0oVJzTXiTWp0U1scQAtDccKDBzkIG7R
-vJ6Ne8xhdaGxu+92bECPp52edOwbD7S5c3ayDr50qHW7Jff+Wd9LaXjpQDxIeMf4
-RUPlbLbpQ0qWEUk2phGUha1j/Tank6V5TKwM1wIDAQABo1AwTjAdBgNVHQ4EFgQU
-6gIveONq1Pasrr1DKE92Qq9wpcAwHwYDVR0jBBgwFoAU6gIveONq1Pasrr1DKE92
-Qq9wpcAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAhy90ipsOXmeM
-AqXEKc4YA6G9ew/99fYlBaML8qvDyojZDL6Ur7uB2X+eOhB60H/WHCTs0kaWYnnq
-dGNfJnaV5ubQwrBOUfpmNdd5HQnxQXcdXev3CqMjz/Sdf9ckdoRkHnZNuqPCF2LO
-CB4x9tAo0BPBpnWO5g6O9JEowUv1Zw+hjKudcv8qZXixxuamaDGALZfbG7EG5oK9
-nhpnpb77JBu9WFTRsJfrAXfVo9+s8M38nLOp76Jy9O9jGlUpmG72KTAnqmgOqRzT
-C+X74eOUf02JV37kpPYLYnsKYjHqJRtBESgu/SE9CgHIMHbNkqUQTHoStBQxah7I
-zb9fkDRHsQ==
------END CERTIFICATE-----

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/layout/content_main.xml b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/layout/content_main.xml
index facc2b015a6463c11337a76710e458333513ab00..ceea80dd15057766855f1a827506751b0ca1cc52 100644 (file)
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/layout/content_main.xml
+++ b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/layout/content_main.xml
@@ -129,5 +129,5 @@
         android:layout_weight="1"
         android:ems="10"
         android:inputType="number|numberDecimal"
-        android:text="192.168.2.191" />
+        android:text="192.168.1.191" />
 </RelativeLayout>

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/values/strings.xml b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/values/strings.xml
index 2b20a3d478cfcb2a2a003051e2f6f40998bfed64..09fa112c9c2503aabcea81eed9928f8b2ac4adb2 100644 (file)
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/values/strings.xml
+++ b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">Irrigation</string>
     <string name="action_settings">Settings</string>
-    <string name="destination_ip">192.168.2.191</string>
+    <string name="destination_ip">192.168.1.191</string>
 </resources>

diff --git a/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle b/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle
index b860e1ca53df4959e41af4aac92d37ad89e38452..ea15b26ffcc7438e282c9b9aca332841a8714a33 100644 (file)
--- a/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle
+++ b/benchmarks/other/PhoneInterface/SpeakerLocator/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     useLibrary 'org.apache.http.legacy'
     defaultConfig {
         applicationId "com.example.xub3.speakerlocator"