summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-06-05 23:45:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 23:45:45 +0000
commit912f705f1f98ba2fc744601994dfbe12f391b0ae (patch)
treed64e2f70b0a34ab8564118883a033ae883d96fe8 /telephony/java
parent5c6c06bf187e6e96d9db1398108d613f86f5a912 (diff)
parent28964eb236cee7e593cf46ff6bcd61cd0d4c54f6 (diff)
downloadframeworks_base-912f705f1f98ba2fc744601994dfbe12f391b0ae.zip
frameworks_base-912f705f1f98ba2fc744601994dfbe12f391b0ae.tar.gz
frameworks_base-912f705f1f98ba2fc744601994dfbe12f391b0ae.tar.bz2
Merge "Suppress default logging in SubscriptionManager." into mnc-dev
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 33e52bf..193285f 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -387,7 +387,9 @@ public class SubscriptionManager {
public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId);
if (!isValidSubscriptionId(subId)) {
- logd("[getActiveSubscriptionInfo]- invalid subId");
+ if (DBG) {
+ logd("[getActiveSubscriptionInfo]- invalid subId");
+ }
return null;
}
@@ -751,7 +753,9 @@ public class SubscriptionManager {
*/
public static int getSlotId(int subId) {
if (!isValidSubscriptionId(subId)) {
- logd("[getSlotId]- fail");
+ if (DBG) {
+ logd("[getSlotId]- fail");
+ }
}
int result = INVALID_SIM_SLOT_INDEX;
@@ -793,7 +797,9 @@ public class SubscriptionManager {
/** @hide */
public static int getPhoneId(int subId) {
if (!isValidSubscriptionId(subId)) {
- logd("[getPhoneId]- fail");
+ if (DBG) {
+ logd("[getPhoneId]- fail");
+ }
return INVALID_PHONE_INDEX;
}