summaryrefslogtreecommitdiffstats
path: root/telephony/java/com/android
diff options
context:
space:
mode:
authorPrerepa Viswanadham <dham@google.com>2015-06-08 23:44:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 23:44:51 +0000
commit8711ed644bab42c03ab9a22c14e1cb2825a107a6 (patch)
tree8a8abc4c6060b4cdb7066c9546b6bdd04d77ce59 /telephony/java/com/android
parent4cf59747f8e23b1d23ee7450541e34826dccbd4f (diff)
parent3d0f09433a6a26e5d47bd567cac2ce69d1e7eb0c (diff)
downloadframeworks_base-8711ed644bab42c03ab9a22c14e1cb2825a107a6.zip
frameworks_base-8711ed644bab42c03ab9a22c14e1cb2825a107a6.tar.gz
frameworks_base-8711ed644bab42c03ab9a22c14e1cb2825a107a6.tar.bz2
Merge changes from topic 'modemActivityInfo' into mnc-dev
* changes: API for get modem activity info Activity info and stats from modem
Diffstat (limited to 'telephony/java/com/android')
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl7
-rw-r--r--telephony/java/com/android/internal/telephony/RILConstants.java1
2 files changed, 8 insertions, 0 deletions
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.CellInfo;
import android.telephony.IccOpenLogicalChannelResponse;
import android.telephony.NeighboringCellInfo;
import android.telephony.RadioAccessFamily;
+import android.telephony.ModemActivityInfo;
import java.util.List;
@@ -953,4 +954,10 @@ interface ITelephony {
* 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 @@ cat include/telephony/ril.h | \
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;