Merge "health.filesystem::IFileSystem -> health.storage::IStorage"

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",

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 {
     /**

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.
      *

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.