diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/java/android/os/BatteryProperties.aidl | 19 | ||||
| -rw-r--r-- | core/java/android/os/BatteryProperties.java | 110 | ||||
| -rw-r--r-- | core/java/android/os/IBatteryPropertiesListener.aidl | 27 | ||||
| -rw-r--r-- | core/java/android/os/IBatteryPropertiesRegistrar.aidl | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/BatteryService.java | 9 |
6 files changed, 2 insertions, 167 deletions
diff --git a/Android.bp b/Android.bp index e611d109f0ad..ec5cbc35b0ce 100644 --- a/Android.bp +++ b/Android.bp @@ -218,7 +218,6 @@ java_library { "core/java/android/se/omapi/ISecureElementChannel.aidl", "core/java/android/se/omapi/ISecureElementReader.aidl", "core/java/android/se/omapi/ISecureElementSession.aidl", - "core/java/android/os/IBatteryPropertiesListener.aidl", "core/java/android/os/IBatteryPropertiesRegistrar.aidl", "core/java/android/os/ICancellationSignal.aidl", "core/java/android/os/IDeviceIdentifiersPolicyService.aidl", diff --git a/core/java/android/os/BatteryProperties.aidl b/core/java/android/os/BatteryProperties.aidl deleted file mode 100644 index 31fa7b80181f..000000000000 --- a/core/java/android/os/BatteryProperties.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -** Copyright 2013, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.os; - -parcelable BatteryProperties; diff --git a/core/java/android/os/BatteryProperties.java b/core/java/android/os/BatteryProperties.java deleted file mode 100644 index af328d0943ef..000000000000 --- a/core/java/android/os/BatteryProperties.java +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright 2013, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package android.os; - -/** - * {@hide} - */ -public class BatteryProperties implements Parcelable { - public boolean chargerAcOnline; - public boolean chargerUsbOnline; - public boolean chargerWirelessOnline; - public int maxChargingCurrent; - public int maxChargingVoltage; - public int batteryStatus; - public int batteryHealth; - public boolean batteryPresent; - public int batteryLevel; - public int batteryVoltage; - public int batteryTemperature; - public int batteryFullCharge; - public int batteryChargeCounter; - public String batteryTechnology; - - public BatteryProperties() { - } - - public void set(BatteryProperties other) { - chargerAcOnline = other.chargerAcOnline; - chargerUsbOnline = other.chargerUsbOnline; - chargerWirelessOnline = other.chargerWirelessOnline; - maxChargingCurrent = other.maxChargingCurrent; - maxChargingVoltage = other.maxChargingVoltage; - batteryStatus = other.batteryStatus; - batteryHealth = other.batteryHealth; - batteryPresent = other.batteryPresent; - batteryLevel = other.batteryLevel; - batteryVoltage = other.batteryVoltage; - batteryTemperature = other.batteryTemperature; - batteryFullCharge = other.batteryFullCharge; - batteryChargeCounter = other.batteryChargeCounter; - batteryTechnology = other.batteryTechnology; - } - - /* - * Parcel read/write code must be kept in sync with - * frameworks/native/services/batteryservice/BatteryProperties.cpp - */ - - private BatteryProperties(Parcel p) { - chargerAcOnline = p.readInt() == 1 ? true : false; - chargerUsbOnline = p.readInt() == 1 ? true : false; - chargerWirelessOnline = p.readInt() == 1 ? true : false; - maxChargingCurrent = p.readInt(); - maxChargingVoltage = p.readInt(); - batteryStatus = p.readInt(); - batteryHealth = p.readInt(); - batteryPresent = p.readInt() == 1 ? true : false; - batteryLevel = p.readInt(); - batteryVoltage = p.readInt(); - batteryTemperature = p.readInt(); - batteryFullCharge = p.readInt(); - batteryChargeCounter = p.readInt(); - batteryTechnology = p.readString(); - } - - public void writeToParcel(Parcel p, int flags) { - p.writeInt(chargerAcOnline ? 1 : 0); - p.writeInt(chargerUsbOnline ? 1 : 0); - p.writeInt(chargerWirelessOnline ? 1 : 0); - p.writeInt(maxChargingCurrent); - p.writeInt(maxChargingVoltage); - p.writeInt(batteryStatus); - p.writeInt(batteryHealth); - p.writeInt(batteryPresent ? 1 : 0); - p.writeInt(batteryLevel); - p.writeInt(batteryVoltage); - p.writeInt(batteryTemperature); - p.writeInt(batteryFullCharge); - p.writeInt(batteryChargeCounter); - p.writeString(batteryTechnology); - } - - public static final Parcelable.Creator<BatteryProperties> CREATOR - = new Parcelable.Creator<BatteryProperties>() { - public BatteryProperties createFromParcel(Parcel p) { - return new BatteryProperties(p); - } - - public BatteryProperties[] newArray(int size) { - return new BatteryProperties[size]; - } - }; - - public int describeContents() { - return 0; - } -} diff --git a/core/java/android/os/IBatteryPropertiesListener.aidl b/core/java/android/os/IBatteryPropertiesListener.aidl deleted file mode 100644 index 7e239249a33c..000000000000 --- a/core/java/android/os/IBatteryPropertiesListener.aidl +++ /dev/null @@ -1,27 +0,0 @@ -/* -** Copyright 2013, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.os; - -import android.os.BatteryProperties; - -/** - * {@hide} - */ - -oneway interface IBatteryPropertiesListener { - void batteryPropertiesChanged(in BatteryProperties props); -} diff --git a/core/java/android/os/IBatteryPropertiesRegistrar.aidl b/core/java/android/os/IBatteryPropertiesRegistrar.aidl index 468b58b101e5..57a6873c88e0 100644 --- a/core/java/android/os/IBatteryPropertiesRegistrar.aidl +++ b/core/java/android/os/IBatteryPropertiesRegistrar.aidl @@ -16,7 +16,6 @@ package android.os; -import android.os.IBatteryPropertiesListener; import android.os.BatteryProperty; /** @@ -24,8 +23,6 @@ import android.os.BatteryProperty; */ interface IBatteryPropertiesRegistrar { - void registerListener(IBatteryPropertiesListener listener); - void unregisterListener(IBatteryPropertiesListener listener); int getProperty(in int id, out BatteryProperty prop); oneway void scheduleUpdate(); } diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index 87647ca79fea..5c14459da566 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -41,7 +41,6 @@ import android.os.DropBoxManager; import android.os.FileUtils; import android.os.Handler; import android.os.HandlerThread; -import android.os.IBatteryPropertiesListener; import android.os.IBatteryPropertiesRegistrar; import android.os.IBinder; import android.os.OsProtoEnums; @@ -1159,12 +1158,7 @@ public final class BatteryService extends SystemService { // Reduced IBatteryPropertiesRegistrar that only implements getProperty for usage // in BatteryManager. private final class BatteryPropertiesRegistrar extends IBatteryPropertiesRegistrar.Stub { - public void registerListener(IBatteryPropertiesListener listener) { - Slog.e(TAG, "health: must not call registerListener on battery properties"); - } - public void unregisterListener(IBatteryPropertiesListener listener) { - Slog.e(TAG, "health: must not call unregisterListener on battery properties"); - } + @Override public int getProperty(int id, final BatteryProperty prop) throws RemoteException { traceBegin("HealthGetProperty"); try { @@ -1214,6 +1208,7 @@ public final class BatteryService extends SystemService { traceEnd(); } } + @Override public void scheduleUpdate() throws RemoteException { traceBegin("HealthScheduleUpdate"); try { |