From 570d204c4765330e872806022bd25b7b89b936f8 Mon Sep 17 00:00:00 2001 From: William Clark Date: Tue, 13 Oct 2015 13:17:05 -0700 Subject: Udpate instrumentation code Added changes to support new features in QSSP Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788 --- telephony/java/android/telephony/PhoneNumberUtils.java | 1 - telephony/java/android/telephony/TelephonyManager.java | 15 ++++++--------- .../java/com/android/internal/telephony/CallerInfo.java | 6 ++---- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'telephony/java') diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 4b37cdb..5ee1fb2 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -200,7 +200,6 @@ public class PhoneNumberUtils * null 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 index 3dd6793..8342b29 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -706,7 +706,6 @@ 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) @@ -729,7 +728,7 @@ public class TelephonyManager { * @param slotId of which deviceID is returned */ public String getDeviceId(int slotId) { - android.util.SeempLog.record(9); + android.util.SeempLog.record_str(8, ""+slotId); // FIXME this assumes phoneId == slotId try { IPhoneSubInfo info = getSubscriberInfo(); @@ -826,7 +825,7 @@ public class TelephonyManager { * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}. */ public CellLocation getCellLocation() { - android.util.SeempLog.record(66); + android.util.SeempLog.record(49); try { ITelephony telephony = getITelephony(); if (telephony == null) { @@ -924,7 +923,7 @@ public class TelephonyManager { */ @Deprecated public List getNeighboringCellInfo() { - android.util.SeempLog.record(67); + android.util.SeempLog.record(50); try { ITelephony telephony = getITelephony(); if (telephony == null) @@ -1976,7 +1975,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getSimSerialNumber() { - android.util.SeempLog.record(10); return getSimSerialNumber(getDefaultSubscription()); } @@ -1990,7 +1988,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getSimSerialNumber(int subId) { - android.util.SeempLog.record(10); + android.util.SeempLog.record_str(388, ""+subId); try { IPhoneSubInfo info = getSubscriberInfo(); if (info == null) @@ -2080,7 +2078,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getSubscriberId() { - android.util.SeempLog.record(114); return getSubscriberId(getDefaultSubscription()); } @@ -2096,7 +2093,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getSubscriberId(int subId) { - android.util.SeempLog.record(114); + android.util.SeempLog.record_str(389, ""+subId); try { IPhoneSubInfo info = getSubscriberInfo(); if (info == null) @@ -2167,7 +2164,6 @@ public class TelephonyManager { * The default SMS app can also use this. */ public String getLine1Number() { - android.util.SeempLog.record(11); return getLine1NumberForSubscriber(getDefaultSubscription()); } @@ -2186,6 +2182,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getLine1NumberForSubscriber(int subId) { + android.util.SeempLog.record_str(9, ""+subId); String number = null; try { ITelephony telephony = getITelephony(); diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java index 4e4ce5a..6e1a004 100644 --- a/telephony/java/com/android/internal/telephony/CallerInfo.java +++ b/telephony/java/com/android/internal/telephony/CallerInfo.java @@ -165,7 +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); + android.util.SeempLog.record_uri(12, contactRef); CallerInfo info = new CallerInfo(); info.photoResource = 0; info.phoneLabel = null; @@ -284,7 +284,6 @@ 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) { @@ -309,7 +308,6 @@ 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(); @@ -328,7 +326,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); + android.util.SeempLog.record_str(12, "number="+number+",subId="+subId); if (TextUtils.isEmpty(number)) { return null; -- cgit v1.1