summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2018-10-29 15:31:15 -0500
committerSteven Moreland2018-10-29 15:33:11 -0500
commit6e392846877911bc4036c85dbdf27211ddd15786 (patch)
tree98d1fca0cc32e69569c4ca34aa9fe66b6f309fd2
parentfab70a459138b23488f089fe76a0737f86388162 (diff)
downloadplatform-system-libvintf-master.tar.gz
platform-system-libvintf-master.tar.xz
platform-system-libvintf-master.zip
VintfObject docs: don't reference exact locationsHEADmaster
VintfObject.h still references the original system/vendor locations for manifests. These now correspond to many possible locations with legacy compatibility rules and are themselves subject to change. Now, the header just declares that they are built from component pieces. Bug: 76108617 Test: N/A Change-Id: Ie9d0353b0beb0aa1fb6b1ae23ff70bab98ae2667
-rw-r--r--include/vintf/VintfObject.h35
1 files changed, 19 insertions, 16 deletions
diff --git a/include/vintf/VintfObject.h b/include/vintf/VintfObject.h
index 50c1fed..67c33b6 100644
--- a/include/vintf/VintfObject.h
+++ b/include/vintf/VintfObject.h
@@ -94,26 +94,29 @@ class VintfObject {
94 std::unique_ptr<details::PropertyFetcher>&& = nullptr); 94 std::unique_ptr<details::PropertyFetcher>&& = nullptr);
95 95
96 /* 96 /*
97 * Return the API that access the device-side HAL manifest stored 97 * Return the API that access the device-side HAL manifests built from component pieces on the
98 * in /vendor/manifest.xml. 98 * vendor partition.
99 */ 99 */
100 std::shared_ptr<const HalManifest> getDeviceHalManifest(bool skipCache = false); 100 std::shared_ptr<const HalManifest> getDeviceHalManifest(bool skipCache = false);
101 101
102 /* 102 /*
103 * Return the API that access the framework-side HAL manifest stored 103 * Return the API that access the framework-side HAL manifest built from component pieces on the
104 * in /system/manfiest.xml. 104 * system partition.
105 */ 105 */
106 std::shared_ptr<const HalManifest> getFrameworkHalManifest(bool skipCache = false); 106 std::shared_ptr<const HalManifest> getFrameworkHalManifest(bool skipCache = false);
107 107
108 /* 108 /*
109 * Return the API that access the device-side compatibility matrix stored 109 * Return the API that access the device-side compatibility matrix built from component pieces
110 * in /vendor/compatibility_matrix.xml. 110 * on the vendor partition.
111 */ 111 */
112 std::shared_ptr<const CompatibilityMatrix> getDeviceCompatibilityMatrix(bool skipCache = false); 112 std::shared_ptr<const CompatibilityMatrix> getDeviceCompatibilityMatrix(bool skipCache = false);
113 113
114 /* 114 /*
115 * Return the API that access the framework-side compatibility matrix stored 115 * Return the API that access the framework-side compatibility matrix built from component
116 * in /system/compatibility_matrix.xml. 116 * pieces on the system partition.
117 *
118 * This automatically selects the right compatibility matrix according to the target-level
119 * specified by the device.
117 */ 120 */
118 std::shared_ptr<const CompatibilityMatrix> getFrameworkCompatibilityMatrix( 121 std::shared_ptr<const CompatibilityMatrix> getFrameworkCompatibilityMatrix(
119 bool skipCache = false); 122 bool skipCache = false);
@@ -228,27 +231,27 @@ class VintfObject {
228 // Static variants of member functions. 231 // Static variants of member functions.
229 232
230 /* 233 /*
231 * Return the API that access the device-side HAL manifest stored 234 * Return the API that access the device-side HAL manifest built from component pieces on the
232 * in /vendor/manifest.xml. 235 * vendor partition.
233 */ 236 */
234 static std::shared_ptr<const HalManifest> GetDeviceHalManifest(bool skipCache = false); 237 static std::shared_ptr<const HalManifest> GetDeviceHalManifest(bool skipCache = false);
235 238
236 /* 239 /*
237 * Return the API that access the framework-side HAL manifest stored 240 * Return the API that access the framework-side HAL manifest built from component pieces on the
238 * in /system/manfiest.xml. 241 * system partition.
239 */ 242 */
240 static std::shared_ptr<const HalManifest> GetFrameworkHalManifest(bool skipCache = false); 243 static std::shared_ptr<const HalManifest> GetFrameworkHalManifest(bool skipCache = false);
241 244
242 /* 245 /*
243 * Return the API that access the device-side compatibility matrix stored 246 * Return the API that access the device-side compatibility matrix built from component pieces
244 * in /vendor/compatibility_matrix.xml. 247 * on the vendor partition.
245 */ 248 */
246 static std::shared_ptr<const CompatibilityMatrix> GetDeviceCompatibilityMatrix( 249 static std::shared_ptr<const CompatibilityMatrix> GetDeviceCompatibilityMatrix(
247 bool skipCache = false); 250 bool skipCache = false);
248 251
249 /* 252 /*
250 * Return the API that access the framework-side compatibility matrix stored 253 * Return the API that access the framework-side compatibility matrix built from component
251 * in /system/compatibility_matrix.xml. 254 * pieces on the system partition.
252 */ 255 */
253 static std::shared_ptr<const CompatibilityMatrix> GetFrameworkCompatibilityMatrix( 256 static std::shared_ptr<const CompatibilityMatrix> GetFrameworkCompatibilityMatrix(
254 bool skipCache = false); 257 bool skipCache = false);