summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorZiran Sun <ziran.sun@samsung.com>2016-10-10 15:17:10 +0100
committerZiran Sun <ziran.sun@samsung.com>2016-10-13 12:53:16 +0000
commita509393393782cbf6d1b39d4676ef24d677fd121 (patch)
tree9a6fbc8e95c3e357a68353aa4546c5267c165317 /android
parenta1ef319d987b1fd87ac8f0a360287e868aed32a2 (diff)
downloadiotivity-a509393393782cbf6d1b39d4676ef24d677fd121.tar.gz
iotivity-a509393393782cbf6d1b39d4676ef24d677fd121.tar.bz2
iotivity-a509393393782cbf6d1b39d4676ef24d677fd121.zip
Change settings on deviceInfo and platformInfo in samples as per specs.
Bug: https://jira.iotivity.org/browse/IOT-1435 Change-Id: I9de03c0c6c09d4632503f9ad8f2943c9f1468527 Signed-off-by: Ziran Sun <ziran.sun@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/13051 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> (cherry picked from commit 18459f405216414506c405c118633405a27b0585) Reviewed-on: https://gerrit.iotivity.org/gerrit/13175
Diffstat (limited to 'android')
-rw-r--r--android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java b/android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
index c0d96b758..db35c11ee 100644
--- a/android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
+++ b/android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
@@ -77,17 +77,17 @@ public class DeviceDiscoveryServer extends Activity {
}
OcPlatformInfo platformInfo = new OcPlatformInfo(
- "myPlatformId", //Platform ID
- "myManufactName", //Manufacturer Name
- "www.myurl.com", //Manufacturer URL
- "myModelNumber", //Model Number
- "myDateOfManufacture", //Date of Manufacture
- "myPlatformVersion", //Platform Version
- "Manufacturer OS version", //Operating System Version
- "myHardwareVersion", //Hardware Version
- "myFirmwareVersion", //Firmware Version
- "www.mysupporturl.com", //Support URL
- String.valueOf(System.currentTimeMillis()) // System Time
+ "0A3E0D6F-DBF5-404E-8719-D6880042463A", // Platform ID
+ "myManufactName", // Manufacturer Name
+ "https://www.mylink.com", // Manufacturer Link
+ "myModelNumber", // Model Number
+ "2016-01-15", // Date of Manufacture
+ "myPlatformVersion", // Platform Version
+ "Manufacturer OS version", // Operating System Version
+ "myHardwareVersion", // Hardware Version
+ "myFirmwareVersion", // Firmware Version
+ "https://www.mysupportlink.com", // Support Link
+ String.valueOf(System.currentTimeMillis()) // System Time
);
try {
msg("Registering platform info");