Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress default logging in SubscriptionManager." into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-06-05 23:45:40 +00:00
committed by Android (Google) Code Review
parent 5c6c06bf18 28964eb236
commit 912f705f1f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -387,7 +387,9 @@ public class SubscriptionManager {
public SubscriptionInfo getActiveSubscriptionInfo(int subId) { public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId); if (VDBG) logd("[getActiveSubscriptionInfo]+ subId=" + subId);
if (!isValidSubscriptionId(subId)) { if (!isValidSubscriptionId(subId)) {
if (DBG) {
logd("[getActiveSubscriptionInfo]- invalid subId"); logd("[getActiveSubscriptionInfo]- invalid subId");
}
return null; return null;
} }
@@ -751,8 +753,10 @@ public class SubscriptionManager {
*/ */
public static int getSlotId(int subId) { public static int getSlotId(int subId) {
if (!isValidSubscriptionId(subId)) { if (!isValidSubscriptionId(subId)) {
if (DBG) {
logd("[getSlotId]- fail"); logd("[getSlotId]- fail");
} }
}
int result = INVALID_SIM_SLOT_INDEX; int result = INVALID_SIM_SLOT_INDEX;
@@ -793,7 +797,9 @@ public class SubscriptionManager {
/** @hide */ /** @hide */
public static int getPhoneId(int subId) { public static int getPhoneId(int subId) {
if (!isValidSubscriptionId(subId)) { if (!isValidSubscriptionId(subId)) {
if (DBG) {
logd("[getPhoneId]- fail"); logd("[getPhoneId]- fail");
}
return INVALID_PHONE_INDEX; return INVALID_PHONE_INDEX;
} }