From ec75d33d9c3de4d8b6f5e5aa7be84e002d4ead52 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 19 Sep 2018 10:17:40 -0700 Subject: [PATCH] health.filesystem::IFileSystem -> health.storage::IStorage Rename the HAL because it is regarding 'storage health', not 'filesystem health'. Bug: 111655771 Test: compiles Change-Id: I07072c876fb07c88be8bd74cf6b84aec6020a697 Merged-In: I07072c876fb07c88be8bd74cf6b84aec6020a697 --- health/{filesystem => storage}/1.0/Android.bp | 4 ++-- .../{filesystem => storage}/1.0/IGarbageCollectCallback.hal | 4 ++-- .../1.0/IFileSystem.hal => storage/1.0/IStorage.hal} | 6 +++--- health/{filesystem => storage}/1.0/types.hal | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename health/{filesystem => storage}/1.0/Android.bp (81%) rename health/{filesystem => storage}/1.0/IGarbageCollectCallback.hal (90%) rename health/{filesystem/1.0/IFileSystem.hal => storage/1.0/IStorage.hal} (91%) rename health/{filesystem => storage}/1.0/types.hal (95%) diff --git a/health/filesystem/1.0/Android.bp b/health/storage/1.0/Android.bp similarity index 81% rename from health/filesystem/1.0/Android.bp rename to health/storage/1.0/Android.bp index cb7cf0e88e..35ee34f207 100644 --- a/health/filesystem/1.0/Android.bp +++ b/health/storage/1.0/Android.bp @@ -1,15 +1,15 @@ // This file is autogenerated by hidl-gen -Landroidbp. hidl_interface { - name: "android.hardware.health.filesystem@1.0", + name: "android.hardware.health.storage@1.0", root: "android.hardware", vndk: { enabled: true, }, srcs: [ "types.hal", - "IFileSystem.hal", "IGarbageCollectCallback.hal", + "IStorage.hal", ], interfaces: [ "android.hidl.base@1.0", diff --git a/health/filesystem/1.0/IGarbageCollectCallback.hal b/health/storage/1.0/IGarbageCollectCallback.hal similarity index 90% rename from health/filesystem/1.0/IGarbageCollectCallback.hal rename to health/storage/1.0/IGarbageCollectCallback.hal index 901c35c86c..2c24ead14c 100644 --- a/health/filesystem/1.0/IGarbageCollectCallback.hal +++ b/health/storage/1.0/IGarbageCollectCallback.hal @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.hardware.health.filesystem@1.0; +package android.hardware.health.storage@1.0; /** - * Callback interface to IFileSystem.garbageCollect. + * Callback interface to IStorage.garbageCollect. */ interface IGarbageCollectCallback { /** diff --git a/health/filesystem/1.0/IFileSystem.hal b/health/storage/1.0/IStorage.hal similarity index 91% rename from health/filesystem/1.0/IFileSystem.hal rename to health/storage/1.0/IStorage.hal index a5e6487a63..980cf45de7 100644 --- a/health/filesystem/1.0/IFileSystem.hal +++ b/health/storage/1.0/IStorage.hal @@ -14,15 +14,15 @@ * limitations under the License. */ -package android.hardware.health.filesystem@1.0; +package android.hardware.health.storage@1.0; import IGarbageCollectCallback; /** - * IFileSystem is an interface that provides operations on underlying storage + * IStorage is an interface that provides operations on underlying storage * devices, including flash memory. */ -interface IFileSystem { +interface IStorage { /** * Start garbage collection on the driver of storage devices. * diff --git a/health/filesystem/1.0/types.hal b/health/storage/1.0/types.hal similarity index 95% rename from health/filesystem/1.0/types.hal rename to health/storage/1.0/types.hal index 0d2db2cdf4..2da0871e34 100644 --- a/health/filesystem/1.0/types.hal +++ b/health/storage/1.0/types.hal @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.health.filesystem@1.0; +package android.hardware.health.storage@1.0; /** * Status values for HAL methods.