summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-09-20 12:26:53 -0500
committerGerrit Code Review2018-09-20 12:26:53 -0500
commitb670abc941d29336762e3c53492cc8d25b18fd0d (patch)
tree2fe23767443f2539c77f597c5bc2eb8aebe4fc63
parentc369d81965dfc24bd9316937fa6ec10be935ca67 (diff)
parentec75d33d9c3de4d8b6f5e5aa7be84e002d4ead52 (diff)
downloadplatform-hardware-interfaces-b670abc941d29336762e3c53492cc8d25b18fd0d.tar.gz
platform-hardware-interfaces-b670abc941d29336762e3c53492cc8d25b18fd0d.tar.xz
platform-hardware-interfaces-b670abc941d29336762e3c53492cc8d25b18fd0d.zip
Merge "health.filesystem::IFileSystem -> health.storage::IStorage"
-rw-r--r--health/storage/1.0/Android.bp (renamed from health/filesystem/1.0/Android.bp)4
-rw-r--r--health/storage/1.0/IGarbageCollectCallback.hal (renamed from health/filesystem/1.0/IGarbageCollectCallback.hal)4
-rw-r--r--health/storage/1.0/IStorage.hal (renamed from health/filesystem/1.0/IFileSystem.hal)6
-rw-r--r--health/storage/1.0/types.hal (renamed from health/filesystem/1.0/types.hal)2
4 files changed, 8 insertions, 8 deletions
diff --git a/health/filesystem/1.0/Android.bp b/health/storage/1.0/Android.bp
index cb7cf0e8..35ee34f2 100644
--- a/health/filesystem/1.0/Android.bp
+++ b/health/storage/1.0/Android.bp
@@ -1,15 +1,15 @@
1// This file is autogenerated by hidl-gen -Landroidbp. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3hidl_interface { 3hidl_interface {
4 name: "android.hardware.health.filesystem@1.0", 4 name: "android.hardware.health.storage@1.0",
5 root: "android.hardware", 5 root: "android.hardware",
6 vndk: { 6 vndk: {
7 enabled: true, 7 enabled: true,
8 }, 8 },
9 srcs: [ 9 srcs: [
10 "types.hal", 10 "types.hal",
11 "IFileSystem.hal",
12 "IGarbageCollectCallback.hal", 11 "IGarbageCollectCallback.hal",
12 "IStorage.hal",
13 ], 13 ],
14 interfaces: [ 14 interfaces: [
15 "android.hidl.base@1.0", 15 "android.hidl.base@1.0",
diff --git a/health/filesystem/1.0/IGarbageCollectCallback.hal b/health/storage/1.0/IGarbageCollectCallback.hal
index 901c35c8..2c24ead1 100644
--- a/health/filesystem/1.0/IGarbageCollectCallback.hal
+++ b/health/storage/1.0/IGarbageCollectCallback.hal
@@ -13,10 +13,10 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16package android.hardware.health.filesystem@1.0; 16package android.hardware.health.storage@1.0;
17 17
18/** 18/**
19 * Callback interface to IFileSystem.garbageCollect. 19 * Callback interface to IStorage.garbageCollect.
20 */ 20 */
21interface IGarbageCollectCallback { 21interface IGarbageCollectCallback {
22 /** 22 /**
diff --git a/health/filesystem/1.0/IFileSystem.hal b/health/storage/1.0/IStorage.hal
index a5e6487a..980cf45d 100644
--- a/health/filesystem/1.0/IFileSystem.hal
+++ b/health/storage/1.0/IStorage.hal
@@ -14,15 +14,15 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17package android.hardware.health.filesystem@1.0; 17package android.hardware.health.storage@1.0;
18 18
19import IGarbageCollectCallback; 19import IGarbageCollectCallback;
20 20
21/** 21/**
22 * IFileSystem is an interface that provides operations on underlying storage 22 * IStorage is an interface that provides operations on underlying storage
23 * devices, including flash memory. 23 * devices, including flash memory.
24 */ 24 */
25interface IFileSystem { 25interface IStorage {
26 /** 26 /**
27 * Start garbage collection on the driver of storage devices. 27 * Start garbage collection on the driver of storage devices.
28 * 28 *
diff --git a/health/filesystem/1.0/types.hal b/health/storage/1.0/types.hal
index 0d2db2cd..2da0871e 100644
--- a/health/filesystem/1.0/types.hal
+++ b/health/storage/1.0/types.hal
@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17package android.hardware.health.filesystem@1.0; 17package android.hardware.health.storage@1.0;
18 18
19/** 19/**
20 * Status values for HAL methods. 20 * Status values for HAL methods.