From 7b0301f8a0f3889063308abfd9c32b0797cd5fda Mon Sep 17 00:00:00 2001
From: William Clark <wclark@codeaurora.org>
Date: Fri, 21 Aug 2015 17:44:46 -0700
Subject: SEEMP: Add more framework instrumentation

Instrument framework files to log events of interest.

Conflicts:
	core/java/android/accounts/AccountManager.java

Change-Id: Ia45651e6352586f910039b51cac2356f65f80010
---
 telephony/java/android/telephony/PhoneNumberUtils.java        | 1 +
 telephony/java/android/telephony/TelephonyManager.java        | 9 +++++++++
 telephony/java/com/android/internal/telephony/CallerInfo.java | 4 ++++
 3 files changed, 14 insertions(+)
 mode change 100755 => 100644 telephony/java/android/telephony/TelephonyManager.java

(limited to 'telephony')

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index c73b42c..c92fd90 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -150,6 +150,7 @@ public class PhoneNumberUtils
      *         <code>null</code> if the number cannot be found.
      */
     public static String getNumberFromIntent(Intent intent, Context context) {
+        android.util.SeempLog.record(12);
         String number = null;
 
         Uri uri = intent.getData();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
old mode 100755
new mode 100644
index 1afb1cb..ecfff3e
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -699,6 +699,7 @@ public class TelephonyManager {
      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      */
     public String getDeviceId() {
+        android.util.SeempLog.record(9);
         try {
             ITelephony telephony = getITelephony();
             if (telephony == null)
@@ -721,6 +722,7 @@ public class TelephonyManager {
      * @param slotId of which deviceID is returned
      */
     public String getDeviceId(int slotId) {
+        android.util.SeempLog.record(9);
         // FIXME this assumes phoneId == slotId
         try {
             IPhoneSubInfo info = getSubscriberInfo();
@@ -817,6 +819,7 @@ public class TelephonyManager {
      * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}.
      */
     public CellLocation getCellLocation() {
+        android.util.SeempLog.record(66);
         try {
             ITelephony telephony = getITelephony();
             if (telephony == null) {
@@ -914,6 +917,7 @@ public class TelephonyManager {
      */
     @Deprecated
     public List<NeighboringCellInfo> getNeighboringCellInfo() {
+        android.util.SeempLog.record(67);
         try {
             ITelephony telephony = getITelephony();
             if (telephony == null)
@@ -1910,6 +1914,7 @@ public class TelephonyManager {
      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      */
     public String getSimSerialNumber() {
+         android.util.SeempLog.record(10);
          return getSimSerialNumber(getDefaultSubscription());
     }
 
@@ -1923,6 +1928,7 @@ public class TelephonyManager {
      */
     /** {@hide} */
     public String getSimSerialNumber(int subId) {
+        android.util.SeempLog.record(10);
         try {
             IPhoneSubInfo info = getSubscriberInfo();
             if (info == null)
@@ -1997,6 +2003,7 @@ public class TelephonyManager {
      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      */
     public String getSubscriberId() {
+        android.util.SeempLog.record(114);
         return getSubscriberId(getDefaultSubscription());
     }
 
@@ -2012,6 +2019,7 @@ public class TelephonyManager {
      */
     /** {@hide} */
     public String getSubscriberId(int subId) {
+        android.util.SeempLog.record(114);
         try {
             IPhoneSubInfo info = getSubscriberInfo();
             if (info == null)
@@ -2082,6 +2090,7 @@ public class TelephonyManager {
      * The default SMS app can also use this.
      */
     public String getLine1Number() {
+        android.util.SeempLog.record(11);
         return getLine1NumberForSubscriber(getDefaultSubscription());
     }
 
diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java
index be7e702..4e4ce5a 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfo.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfo.java
@@ -165,6 +165,7 @@ public class CallerInfo {
      * number. The returned CallerInfo is null if no number is supplied.
      */
     public static CallerInfo getCallerInfo(Context context, Uri contactRef, Cursor cursor) {
+        android.util.SeempLog.record(15);
         CallerInfo info = new CallerInfo();
         info.photoResource = 0;
         info.phoneLabel = null;
@@ -283,6 +284,7 @@ public class CallerInfo {
      * number. The returned CallerInfo is null if no number is supplied.
      */
     public static CallerInfo getCallerInfo(Context context, Uri contactRef) {
+        android.util.SeempLog.record(15);
         CallerInfo info = null;
         ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context);
         if (cr != null) {
@@ -307,6 +309,7 @@ public class CallerInfo {
      * with all relevant fields empty or null.
      */
     public static CallerInfo getCallerInfo(Context context, String number) {
+        android.util.SeempLog.record(15);
         if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number...");
 
         int subId = SubscriptionManager.getDefaultSubId();
@@ -325,6 +328,7 @@ public class CallerInfo {
      * with all relevant fields empty or null.
      */
     public static CallerInfo getCallerInfo(Context context, String number, int subId) {
+        android.util.SeempLog.record(15);
 
         if (TextUtils.isEmpty(number)) {
             return null;
-- 
cgit v1.1