projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.0.1
[platform/upstream/iotivity.git]
/
android
/
android_api
/
base
/
src
/
main
/
java
/
org
/
iotivity
/
base
/
OcPlatform.java
diff --git
a/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
b/android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
index
5b2388d
..
8733878
100644
(file)
--- a/
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
+++ b/
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
@@
-70,6
+70,7
@@
public final class OcPlatform {
public static final String PRESENCE_URI = "/oic/ad";
private static volatile boolean sIsPlatformInitialized = false;
public static final String PRESENCE_URI = "/oic/ad";
private static volatile boolean sIsPlatformInitialized = false;
+ private static QualityOfService sPlatformQualityOfService = QualityOfService.NA;
private OcPlatform() {
}
private OcPlatform() {
}
@@
-86,6
+87,8
@@
public final class OcPlatform {
if (!sIsPlatformInitialized) {
CaInterface.initialize(platformConfig.getContext());
if (!sIsPlatformInitialized) {
CaInterface.initialize(platformConfig.getContext());
+ sPlatformQualityOfService = platformConfig.getQualityOfService();
+
OcPlatform.configure(
platformConfig.getServiceType().getValue(),
platformConfig.getModeType().getValue(),
OcPlatform.configure(
platformConfig.getServiceType().getValue(),
platformConfig.getModeType().getValue(),
@@
-463,7
+466,7
@@
public final class OcPlatform {
/**
* This API registers a resource with the server
/**
* This API registers a resource with the server
- * <
P
>
+ * <
p/
>
* Note: This API applies to server & client side.
* </P>
*
* Note: This API applies to server & client side.
* </P>
*
@@
-482,9
+485,10
@@
public final class OcPlatform {
/**
* This API registers a resource with the server NOTE: This API applies to server side only.
/**
* This API registers a resource with the server NOTE: This API applies to server side only.
- * <
P
>
+ * <
p/
>
* Note: This API applies to server side only.
* </P>
* Note: This API applies to server side only.
* </P>
+ *
* @param resourceUri The URI of the resource. Example: "a/light"
* @param resourceTypeName The resource type. Example: "light"
* @param resourceInterface The resource interface (whether it is collection etc).
* @param resourceUri The URI of the resource. Example: "a/light"
* @param resourceTypeName The resource type. Example: "light"
* @param resourceInterface The resource interface (whether it is collection etc).
@@
-933,4
+937,14
@@
public final class OcPlatform {
"OcPlatform.Configure before any other API calls are permitted");
}
}
"OcPlatform.Configure before any other API calls are permitted");
}
}
+
+ /**
+ * Gets platform quality of service
+ *
+ * @return quality of service
+ */
+ public static QualityOfService getPlatformQualityOfService() {
+ OcPlatform.initCheck();
+ return sPlatformQualityOfService;
+ }
}
}