diff options
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | cmds/statsd/src/StatsService.cpp | 3 | ||||
| -rw-r--r-- | core/proto/android/os/enums.proto | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index e72889713945..2e949c5c05a9 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -243,6 +243,7 @@ $(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/APPS/FeatureSplit2_int $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/hardware) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/core/java/android/os/storage/*) $(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/platformprotos_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/statsdprotolite_intermediates) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index f7cc00ced679..6652db609f2f 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -172,6 +172,9 @@ status_t StatsService::onTransact(uint32_t code, const Parcel& data, Parcel* rep * Write debugging data about statsd. */ status_t StatsService::dump(int fd, const Vector<String16>& args) { + if (!checkCallingPermission(String16(kPermissionDump))) { + return PERMISSION_DENIED; + } FILE* out = fdopen(fd, "w"); if (out == NULL) { return NO_MEMORY; // the fd is already open diff --git a/core/proto/android/os/enums.proto b/core/proto/android/os/enums.proto index aa99ac75cbdf..db4a4c4d836b 100644 --- a/core/proto/android/os/enums.proto +++ b/core/proto/android/os/enums.proto @@ -60,7 +60,7 @@ enum BatteryStatusEnum { // They are primarily used by android/os/HardwarePropertiesManager.java. // Any change to the types in the thermal hal should be made here as well. enum TemperatureTypeEnum { - TEMPERATURE_TYPE_UKNOWN = -1; + TEMPERATURE_TYPE_UNKNOWN = -1; TEMPERATURE_TYPE_CPU = 0; TEMPERATURE_TYPE_GPU = 1; TEMPERATURE_TYPE_BATTERY = 2; |