Merge changes from topic 'modemActivityInfo' into mnc-dev
* changes:
API for get modem activity info
Activity info and stats from modem
diff --git a/Android.mk b/Android.mk
index 68f471a..1752caf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -451,6 +451,7 @@
frameworks/base/telephony/java/android/telephony/SignalStrength.aidl \
frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
+ frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
frameworks/base/location/java/android/location/Location.aidl \
frameworks/base/location/java/android/location/Address.aidl \
frameworks/base/location/java/android/location/Criteria.aidl \
diff --git a/telephony/java/android/telephony/ModemActivityInfo.aidl b/telephony/java/android/telephony/ModemActivityInfo.aidl
new file mode 100644
index 0000000..b85ef7a
--- /dev/null
+++ b/telephony/java/android/telephony/ModemActivityInfo.aidl
@@ -0,0 +1,20 @@
+/*
+**
+** Copyright 2015, 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.telephony;
+
+parcelable ModemActivityInfo;
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
new file mode 100644
index 0000000..ea96e7c
--- /dev/null
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2015 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.telephony;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Arrays;
+
+/**
+ * Reports modem activity information
+ * @hide
+ */
+public class ModemActivityInfo implements Parcelable {
+ /**
+ * Tx power index
+ * index 0 = tx_power < 0dBm
+ * index 1 = 0dBm < tx_power < 5dBm
+ * index 2 = 5dBm < tx_power < 15dBm
+ * index 3 = 15dBm < tx_power < 20dBm
+ * index 4 = tx_power > 20dBm
+ */
+ public static final int TX_POWER_LEVELS = 5;
+
+ private final long mTimestamp;
+ private final int mSleepTimeMs;
+ private final int mIdleTimeMs;
+ private final int [] mTxTimeMs = new int[TX_POWER_LEVELS];
+ private final int mRxTimeMs;
+ private final int mEnergyUsed;
+
+ public ModemActivityInfo(long timestamp, int sleepTimeMs, int idleTimeMs,
+ int[] txTimeMs, int rxTimeMs, int energyUsed) {
+ mTimestamp = timestamp;
+ mSleepTimeMs = sleepTimeMs;
+ mIdleTimeMs = idleTimeMs;
+ System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS));
+ mRxTimeMs = rxTimeMs;
+ mEnergyUsed = energyUsed;
+ }
+
+ @Override
+ public String toString() {
+ return "ModemActivityInfo{"
+ + " mTimestamp=" + mTimestamp
+ + " mSleepTimeMs=" + mSleepTimeMs
+ + " mTxTimeMs[]=" + Arrays.toString(mTxTimeMs)
+ + " mRxTimeMs=" + mRxTimeMs
+ + " mEnergyUsed=" + mEnergyUsed
+ + "}";
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public static final Parcelable.Creator<ModemActivityInfo> CREATOR =
+ new Parcelable.Creator<ModemActivityInfo>() {
+ public ModemActivityInfo createFromParcel(Parcel in) {
+ long timestamp = in.readLong();
+ int sleepTimeMs = in.readInt();
+ int idleTimeMs = in.readInt();
+ int[] txTimeMs = new int[TX_POWER_LEVELS];
+ for (int i = 0; i < TX_POWER_LEVELS; i++) {
+ txTimeMs[i] = in.readInt();
+ }
+ int rxTimeMs = in.readInt();
+ int energyUsed = in.readInt();
+ return new ModemActivityInfo(timestamp, sleepTimeMs, idleTimeMs,
+ txTimeMs, rxTimeMs, energyUsed);
+ }
+
+ public ModemActivityInfo[] newArray(int size) {
+ return new ModemActivityInfo[size];
+ }
+ };
+
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(mTimestamp);
+ dest.writeInt(mSleepTimeMs);
+ dest.writeInt(mIdleTimeMs);
+ for (int i = 0; i < TX_POWER_LEVELS; i++) {
+ dest.writeInt(mTxTimeMs[i]);
+ }
+ dest.writeInt(mRxTimeMs);
+ dest.writeInt(mEnergyUsed);
+ }
+
+ /**
+ * @return timestamp of record creation
+ */
+ public long getTimestamp() {
+ return mTimestamp;
+ }
+
+ /**
+ * @return tx time in ms. It's an array of tx times
+ * with each index...
+ */
+ public int [] getTxTimeMillis() {
+ return mTxTimeMs;
+ }
+
+ /**
+ * @return sleep time in ms.
+ */
+ public int getSleepTimeMillis() {
+ return mSleepTimeMs;
+ }
+
+ /**
+ * @return idle time in ms.
+ */
+ public int getIdleTimeMillis() {
+ return mIdleTimeMs;
+ }
+
+ /**
+ * @return rx time in ms.
+ */
+ public int getRxTimeMillis() {
+ return mRxTimeMs;
+ }
+
+ /**
+ * product of current(mA), voltage(V) and time(ms)
+ * @return energy used
+ */
+ public int getEnergyUsed () {
+ return mEnergyUsed;
+ }
+
+ /**
+ * @return if the record is valid
+ */
+ public boolean isValid() {
+ int totalTxTimeMs = 0;
+ int txTime [] = getTxTimeMillis();
+ for (int i = 0; i < TX_POWER_LEVELS; i++) {
+ totalTxTimeMs += txTime[i];
+ }
+ return ((getIdleTimeMillis() != 0) || (totalTxTimeMs != 0)
+ || (getSleepTimeMillis() != 0) || (getIdleTimeMillis() != 0));
+ }
+}
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 86f7ec3..054157d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4617,7 +4617,22 @@
}
} catch (RemoteException ex) {
}
+ return null;
+ }
+ /**
+ * Returns the modem activity info.
+ * @hide
+ */
+ public ModemActivityInfo getModemActivityInfo() {
+ try {
+ ITelephony service = getITelephony();
+ if (service != null) {
+ return service.getModemActivityInfo();
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error calling ITelephony#getModemActivityInfo", e);
+ }
return null;
}
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 11d0ea6..77f90ab 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -23,6 +23,7 @@
import android.telephony.IccOpenLogicalChannelResponse;
import android.telephony.NeighboringCellInfo;
import android.telephony.RadioAccessFamily;
+import android.telephony.ModemActivityInfo;
import java.util.List;
@@ -953,4 +954,10 @@
* if no locale could be derived.
*/
String getLocaleFromDefaultSim();
+
+ /**
+ * Return the modem activity info.
+ *@hide
+ */
+ ModemActivityInfo getModemActivityInfo();
}
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 12541d8..8d48c86 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -323,6 +323,7 @@
int RIL_REQUEST_START_LCE = 132;
int RIL_REQUEST_STOP_LCE = 133;
int RIL_REQUEST_PULL_LCEDATA = 134;
+ int RIL_REQUEST_GET_ACTIVITY_INFO = 135;
int RIL_UNSOL_RESPONSE_BASE = 1000;
int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;