diff options
| author | Howard Chen <howardsoc@google.com> | 2019-08-02 11:21:58 +0800 |
|---|---|---|
| committer | Howard Chen <howardsoc@google.com> | 2019-09-18 15:51:20 +0800 |
| commit | 25b18cc44a5fbe7e1578dc96ac200849ffa70183 (patch) | |
| tree | 5416480781296d8359f3ac7a28812cd25bb687b9 /gsi_service.h | |
| parent | 2d210a8d93e1c7bff5b094d03badec87f089bdc2 (diff) | |
| download | gsid-25b18cc44a5fbe7e1578dc96ac200849ffa70183.tar.gz | |
Clean up legacy methods and naming
remove: startGsiInstall
framework does not use the old prototype any more.
remove: getGsiStatus
framework does not use it any more.
rename: setGsiBootable -> enableGsi
make it consistent with its reverse action: disableGsi
rename: removeGsiInstall -> removeGsi
rename: disableGsiInstall -> disableGsi
the word install now refers to the installation session.
rename for consistency.
Bug: 138544413
Test: gsi_tool install/enable/disable
adb shell am start-activity \
-n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
-a android.os.image.action.START_INSTALL \
-d file:///storage/emulated/0/Download/system.raw.gz \
--el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
--el KEY_USERDATA_SIZE 8589934592
Change-Id: I974d781d1eca82cecd813ad7bf557c5aec6f8f45
Merged-In: I974d781d1eca82cecd813ad7bf557c5aec6f8f45
Diffstat (limited to 'gsi_service.h')
| -rw-r--r-- | gsi_service.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gsi_service.h b/gsi_service.h index 30ec2d7..00043dd 100644 --- a/gsi_service.h +++ b/gsi_service.h @@ -57,8 +57,6 @@ class GsiService : public BinderService<GsiService>, public BnGsiService { static android::sp<IGsiService> Get(Gsid* parent); - binder::Status startGsiInstall(int64_t gsiSize, int64_t userdataSize, bool wipeUserdata, - int* _aidl_return) override; binder::Status beginGsiInstall(const GsiInstallParams& params, int* _aidl_return) override; binder::Status commitGsiChunkFromStream(const ::android::os::ParcelFileDescriptor& stream, int64_t bytes, bool* _aidl_return) override; @@ -66,15 +64,13 @@ class GsiService : public BinderService<GsiService>, public BnGsiService { binder::Status commitGsiChunkFromMemory(const ::std::vector<uint8_t>& bytes, bool* _aidl_return) override; binder::Status cancelGsiInstall(bool* _aidl_return) override; - binder::Status setGsiBootable(bool oneShot, int* _aidl_return) override; + binder::Status enableGsi(bool oneShot, int* _aidl_return) override; binder::Status isGsiEnabled(bool* _aidl_return) override; - binder::Status removeGsiInstall(bool* _aidl_return) override; - binder::Status disableGsiInstall(bool* _aidl_return) override; - binder::Status isGsiRunning(bool* _aidl_return) override; + binder::Status removeGsi(bool* _aidl_return) override; + binder::Status disableGsi(bool* _aidl_return) override; binder::Status isGsiInstalled(bool* _aidl_return) override; + binder::Status isGsiRunning(bool* _aidl_return) override; binder::Status isGsiInstallInProgress(bool* _aidl_return) override; - binder::Status getUserdataImageSize(int64_t* _aidl_return) override; - binder::Status getGsiBootStatus(int* _aidl_return) override; binder::Status getInstalledGsiImageDir(std::string* _aidl_return) override; binder::Status wipeGsiUserdata(int* _aidl_return) override; binder::Status openImageService(const std::string& prefix, |