Merge "Minor renaming: IIncrementalManagerNative -> IIncrementalService."
diff --git a/Android.bp b/Android.bp
index f48e6fe..dbef611 100644
--- a/Android.bp
+++ b/Android.bp
@@ -945,7 +945,7 @@
name: "incremental_manager_aidl",
srcs: [
"core/java/android/os/incremental/IIncrementalManager.aidl",
- "core/java/android/os/incremental/IIncrementalManagerNative.aidl",
+ "core/java/android/os/incremental/IIncrementalService.aidl",
"core/java/android/os/incremental/IncrementalNewFileParams.aidl",
"core/java/android/os/incremental/IncrementalSignature.aidl",
],
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 65a5f6b..50b9d6b 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -163,7 +163,7 @@
import android.os.health.SystemHealthManager;
import android.os.image.DynamicSystemManager;
import android.os.image.IDynamicSystemService;
-import android.os.incremental.IIncrementalManagerNative;
+import android.os.incremental.IIncrementalService;
import android.os.incremental.IncrementalManager;
import android.os.storage.StorageManager;
import android.permission.PermissionControllerManager;
@@ -1299,7 +1299,7 @@
return null;
}
return new IncrementalManager(
- IIncrementalManagerNative.Stub.asInterface(b));
+ IIncrementalService.Stub.asInterface(b));
}});
registerService(Context.FILE_INTEGRITY_SERVICE, FileIntegrityManager.class,
diff --git a/core/java/android/os/incremental/IIncrementalManagerNative.aidl b/core/java/android/os/incremental/IIncrementalService.aidl
similarity index 98%
rename from core/java/android/os/incremental/IIncrementalManagerNative.aidl
rename to core/java/android/os/incremental/IIncrementalService.aidl
index 2b6cd14..21434a2 100644
--- a/core/java/android/os/incremental/IIncrementalManagerNative.aidl
+++ b/core/java/android/os/incremental/IIncrementalService.aidl
@@ -20,7 +20,7 @@
import android.os.incremental.IncrementalNewFileParams;
/** @hide */
-interface IIncrementalManagerNative {
+interface IIncrementalService {
/**
* A set of flags for the |createMode| parameters when creating a new Incremental storage.
*/
diff --git a/core/java/android/os/incremental/IncrementalManager.java b/core/java/android/os/incremental/IncrementalManager.java
index 9c6672d..8990bdf 100644
--- a/core/java/android/os/incremental/IncrementalManager.java
+++ b/core/java/android/os/incremental/IncrementalManager.java
@@ -37,7 +37,7 @@
import java.nio.file.Paths;
/**
- * Provides operations to open or create an IncrementalStorage, using IIncrementalManagerNative
+ * Provides operations to open or create an IncrementalStorage, using IIncrementalService
* service. Example Usage:
*
* <blockquote><pre>
@@ -52,13 +52,13 @@
private static final String TAG = "IncrementalManager";
public static final int CREATE_MODE_TEMPORARY_BIND =
- IIncrementalManagerNative.CREATE_MODE_TEMPORARY_BIND;
+ IIncrementalService.CREATE_MODE_TEMPORARY_BIND;
public static final int CREATE_MODE_PERMANENT_BIND =
- IIncrementalManagerNative.CREATE_MODE_PERMANENT_BIND;
+ IIncrementalService.CREATE_MODE_PERMANENT_BIND;
public static final int CREATE_MODE_CREATE =
- IIncrementalManagerNative.CREATE_MODE_CREATE;
+ IIncrementalService.CREATE_MODE_CREATE;
public static final int CREATE_MODE_OPEN_EXISTING =
- IIncrementalManagerNative.CREATE_MODE_OPEN_EXISTING;
+ IIncrementalService.CREATE_MODE_OPEN_EXISTING;
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"CREATE_MODE_"}, value = {
@@ -70,12 +70,12 @@
public @interface CreateMode {
}
- private final @Nullable IIncrementalManagerNative mNativeService;
+ private final @Nullable IIncrementalService mService;
@GuardedBy("mStorages")
private final SparseArray<IncrementalStorage> mStorages = new SparseArray<>();
- public IncrementalManager(IIncrementalManagerNative nativeService) {
- mNativeService = nativeService;
+ public IncrementalManager(IIncrementalService service) {
+ mService = service;
}
/**
@@ -108,11 +108,11 @@
@NonNull DataLoaderParams params, @CreateMode int createMode,
boolean autoStartDataLoader) {
try {
- final int id = mNativeService.createStorage(path, params.getData(), createMode);
+ final int id = mService.createStorage(path, params.getData(), createMode);
if (id < 0) {
return null;
}
- final IncrementalStorage storage = new IncrementalStorage(mNativeService, id);
+ final IncrementalStorage storage = new IncrementalStorage(mService, id);
synchronized (mStorages) {
mStorages.put(id, storage);
}
@@ -135,11 +135,11 @@
@Nullable
public IncrementalStorage openStorage(@NonNull String path) {
try {
- final int id = mNativeService.openStorage(path);
+ final int id = mService.openStorage(path);
if (id < 0) {
return null;
}
- final IncrementalStorage storage = new IncrementalStorage(mNativeService, id);
+ final IncrementalStorage storage = new IncrementalStorage(mService, id);
synchronized (mStorages) {
mStorages.put(id, storage);
}
@@ -158,12 +158,12 @@
public IncrementalStorage createStorage(@NonNull String path,
@NonNull IncrementalStorage linkedStorage, @CreateMode int createMode) {
try {
- final int id = mNativeService.createLinkedStorage(
+ final int id = mService.createLinkedStorage(
path, linkedStorage.getId(), createMode);
if (id < 0) {
return null;
}
- final IncrementalStorage storage = new IncrementalStorage(mNativeService, id);
+ final IncrementalStorage storage = new IncrementalStorage(mService, id);
synchronized (mStorages) {
mStorages.put(id, storage);
}
@@ -311,11 +311,11 @@
*/
public void closeStorage(@NonNull String path) {
try {
- final int id = mNativeService.openStorage(path);
+ final int id = mService.openStorage(path);
if (id < 0) {
return;
}
- mNativeService.deleteStorage(id);
+ mService.deleteStorage(id);
synchronized (mStorages) {
mStorages.remove(id);
}
diff --git a/core/java/android/os/incremental/IncrementalStorage.java b/core/java/android/os/incremental/IncrementalStorage.java
index e5d1b43..c4b843b 100644
--- a/core/java/android/os/incremental/IncrementalStorage.java
+++ b/core/java/android/os/incremental/IncrementalStorage.java
@@ -40,10 +40,10 @@
public final class IncrementalStorage {
private static final String TAG = "IncrementalStorage";
private final int mId;
- private final IIncrementalManagerNative mService;
+ private final IIncrementalService mService;
- public IncrementalStorage(@NonNull IIncrementalManagerNative is, int id) {
+ public IncrementalStorage(@NonNull IIncrementalService is, int id) {
mService = is;
mId = id;
}
@@ -74,7 +74,7 @@
throws IOException {
try {
int res = mService.makeBindMount(mId, sourcePath, targetPath,
- IIncrementalManagerNative.BIND_TEMPORARY);
+ IIncrementalService.BIND_TEMPORARY);
if (res < 0) {
throw new IOException("bind() failed with errno " + -res);
}
@@ -105,7 +105,7 @@
throws IOException {
try {
int res = mService.makeBindMount(mId, sourcePath, targetPath,
- IIncrementalManagerNative.BIND_PERMANENT);
+ IIncrementalService.BIND_PERMANENT);
if (res < 0) {
throw new IOException("bind() permanent failed with errno " + -res);
}
@@ -293,7 +293,7 @@
}
try {
int res = mService.makeBindMount(mId, sourcePath, destPath,
- IIncrementalManagerNative.BIND_PERMANENT);
+ IIncrementalService.BIND_PERMANENT);
if (res < 0) {
throw new IOException("moveDir() failed at making bind mount, errno " + -res);
}
diff --git a/services/incremental/BinderIncrementalService.h b/services/incremental/BinderIncrementalService.h
index a94a75a..8a09977 100644
--- a/services/incremental/BinderIncrementalService.h
+++ b/services/incremental/BinderIncrementalService.h
@@ -20,12 +20,12 @@
#include <binder/IServiceManager.h>
#include "IncrementalService.h"
-#include "android/os/incremental/BnIncrementalManagerNative.h"
+#include "android/os/incremental/BnIncrementalService.h"
#include "incremental_service.h"
namespace android::os::incremental {
-class BinderIncrementalService : public BnIncrementalManagerNative,
+class BinderIncrementalService : public BnIncrementalService,
public BinderService<BinderIncrementalService> {
public:
BinderIncrementalService(const sp<IServiceManager> &sm);