Rename ApexPackageInfo to ApexInfo.
Also change AIDL parcel member names to camelCase.
Bug: 117589375
Test: compiles, no other code yet interacts with this.
Change-Id: If921b2b440306f808e7bbf106a95df000221b0bd
diff --git a/apexd/Android.bp b/apexd/Android.bp
index 89c68ac..811e7dc 100644
--- a/apexd/Android.bp
+++ b/apexd/Android.bp
@@ -29,7 +29,7 @@
aidl_interface {
name: "apex_aidl_interface",
srcs: [
- "aidl/android/apex/ApexPackageInfo.aidl",
+ "aidl/android/apex/ApexInfo.aidl",
"aidl/android/apex/IApexService.aidl",
],
local_include_dir: "aidl",
diff --git a/apexd/aidl/android/apex/ApexPackageInfo.aidl b/apexd/aidl/android/apex/ApexInfo.aidl
similarity index 87%
rename from apexd/aidl/android/apex/ApexPackageInfo.aidl
rename to apexd/aidl/android/apex/ApexInfo.aidl
index c8fafd9..03daa6e 100644
--- a/apexd/aidl/android/apex/ApexPackageInfo.aidl
+++ b/apexd/aidl/android/apex/ApexInfo.aidl
@@ -16,7 +16,7 @@
package android.apex;
-parcelable ApexPackageInfo {
- @utf8InCpp String package_name;
- long version_code;
+parcelable ApexInfo {
+ @utf8InCpp String packageName;
+ long versionCode;
}
\ No newline at end of file
diff --git a/apexd/aidl/android/apex/IApexService.aidl b/apexd/aidl/android/apex/IApexService.aidl
index e0d66b2..c46bd34 100644
--- a/apexd/aidl/android/apex/IApexService.aidl
+++ b/apexd/aidl/android/apex/IApexService.aidl
@@ -16,11 +16,11 @@
package android.apex;
-import android.apex.ApexPackageInfo;
+import android.apex.ApexInfo;
interface IApexService {
boolean stagePackage(in @utf8InCpp String package_tmp_path);
- ApexPackageInfo[] getActivePackages();
+ ApexInfo[] getActivePackages();
/**
* Not meant for use outside of testing. The call will not be
diff --git a/apexd/apexservice.cpp b/apexd/apexservice.cpp
index 121ba81..7705a53 100644
--- a/apexd/apexservice.cpp
+++ b/apexd/apexservice.cpp
@@ -57,8 +57,7 @@
bool* aidl_return) override;
BinderStatus activatePackage(const std::string& packagePath) override;
BinderStatus deactivatePackage(const std::string& packagePath) override;
- BinderStatus getActivePackages(
- std::vector<ApexPackageInfo>* aidl_return) override;
+ BinderStatus getActivePackages(std::vector<ApexInfo>* aidl_return) override;
// Override onTransact so we can handle shellCommand.
status_t onTransact(uint32_t _aidl_code, const Parcel& _aidl_data,
@@ -141,7 +140,7 @@
}
BinderStatus ApexService::getActivePackages(
- std::vector<ApexPackageInfo>* aidl_return) {
+ std::vector<ApexInfo>* aidl_return) {
LOG(DEBUG) << "Scanning " << kApexRoot << " looking for active packages.";
// This code would be much shorter if C++17's std::filesystem were available,
// which is not at the time of writing this.
@@ -160,7 +159,7 @@
(strcmp(dp->d_name, "..") == 0)) {
continue;
}
- ApexPackageInfo pkg;
+ ApexInfo pkg;
std::vector<std::string> splits = android::base::Split(dp->d_name, "@");
if (splits.size() != 2) {
LOG(ERROR) << "Unable to extract package info from directory name "
@@ -168,8 +167,8 @@
continue;
}
- pkg.package_name = splits[0];
- pkg.version_code = atol(splits[1].c_str());
+ pkg.packageName = splits[0];
+ pkg.versionCode = atol(splits[1].c_str());
aidl_return->push_back(pkg);
}
return BinderStatus::ok();
@@ -240,13 +239,13 @@
return BAD_VALUE;
}
if (args.size() == 1 && args[0] == String16("getActivePackages")) {
- std::vector<ApexPackageInfo> list;
+ std::vector<ApexInfo> list;
android::binder::Status status = getActivePackages(&list);
if (status.isOk()) {
auto out_str = std::fstream(base::StringPrintf("/proc/self/fd/%d", out));
for (auto item : list) {
- out_str << "Package: " << item.package_name
- << " Version: " << item.version_code << std::endl;
+ out_str << "Package: " << item.packageName
+ << " Version: " << item.versionCode << std::endl;
}
return OK;
}
diff --git a/apexd/apexservice_test.cpp b/apexd/apexservice_test.cpp
index 39bdbc0..9e263d5 100644
--- a/apexd/apexservice_test.cpp
+++ b/apexd/apexservice_test.cpp
@@ -31,7 +31,7 @@
#include <gtest/gtest.h>
#include <selinux/selinux.h>
-#include <android/apex/ApexPackageInfo.h>
+#include <android/apex/ApexInfo.h>
#include <android/apex/IApexService.h>
#include "status_or.h"
@@ -68,11 +68,11 @@
static bool IsSelinuxEnforced() { return 0 != security_getenforce(); }
StatusOr<bool> IsActive(const std::string& name, int64_t version) {
- std::vector<ApexPackageInfo> list;
+ std::vector<ApexInfo> list;
android::binder::Status status = service_->getActivePackages(&list);
if (status.isOk()) {
- for (const ApexPackageInfo& p : list) {
- if (p.package_name == name && p.version_code == version) {
+ for (const ApexInfo& p : list) {
+ if (p.packageName == name && p.versionCode == version) {
return StatusOr<bool>(true);
}
}
@@ -82,12 +82,12 @@
}
std::vector<std::string> GetActivePackagesStrings() {
- std::vector<ApexPackageInfo> list;
+ std::vector<ApexInfo> list;
android::binder::Status status = service_->getActivePackages(&list);
if (status.isOk()) {
std::vector<std::string> ret;
- for (const ApexPackageInfo& p : list) {
- ret.push_back(p.package_name + "@" + std::to_string(p.version_code));
+ for (const ApexInfo& p : list) {
+ ret.push_back(p.packageName + "@" + std::to_string(p.versionCode));
}
return ret;
}
