release-request-767e2998-9243-43e0-b656-1acb30ac5115-for-git_oc-release-4124637 snap-temp-L74200000076595014
Change-Id: Ia4157837ebc2a270061442ab21077e06eba7d4b3
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index afd21c7..de677c9 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -3396,7 +3396,7 @@
public CellLocation getCellLocation(WorkSource workSource) {
if (((GsmCellLocation)mCellLoc).getLac() >= 0 &&
((GsmCellLocation)mCellLoc).getCid() >= 0) {
- if (DBG) log("getCellLocation(): X good mCellLoc=" + mCellLoc);
+ if (VDBG) log("getCellLocation(): X good mCellLoc=" + mCellLoc);
return mCellLoc;
} else {
List<CellInfo> result = getAllCellInfo(workSource);
@@ -3421,7 +3421,7 @@
cellLocOther.setLacAndCid(cellIdentityGsm.getLac(),
cellIdentityGsm.getCid());
cellLocOther.setPsc(cellIdentityGsm.getPsc());
- if (DBG) log("getCellLocation(): X ret GSM info=" + cellLocOther);
+ if (VDBG) log("getCellLocation(): X ret GSM info=" + cellLocOther);
return cellLocOther;
} else if (ci instanceof CellInfoWcdma) {
CellInfoWcdma cellInfoWcdma = (CellInfoWcdma)ci;
@@ -3429,7 +3429,7 @@
cellLocOther.setLacAndCid(cellIdentityWcdma.getLac(),
cellIdentityWcdma.getCid());
cellLocOther.setPsc(cellIdentityWcdma.getPsc());
- if (DBG) log("getCellLocation(): X ret WCDMA info=" + cellLocOther);
+ if (VDBG) log("getCellLocation(): X ret WCDMA info=" + cellLocOther);
return cellLocOther;
} else if ((ci instanceof CellInfoLte) &&
((cellLocOther.getLac() < 0) || (cellLocOther.getCid() < 0))) {
@@ -3441,18 +3441,18 @@
cellLocOther.setLacAndCid(cellIdentityLte.getTac(),
cellIdentityLte.getCi());
cellLocOther.setPsc(0);
- if (DBG) {
+ if (VDBG) {
log("getCellLocation(): possible LTE cellLocOther=" + cellLocOther);
}
}
}
}
- if (DBG) {
+ if (VDBG) {
log("getCellLocation(): X ret best answer cellLocOther=" + cellLocOther);
}
return cellLocOther;
} else {
- if (DBG) {
+ if (VDBG) {
log("getCellLocation(): X empty mCellLoc and CellInfo mCellLoc=" + mCellLoc);
}
return mCellLoc;
@@ -4554,8 +4554,8 @@
pw.println(" mRestrictedState=" + mRestrictedState);
pw.println(" mPendingRadioPowerOffAfterDataOff=" + mPendingRadioPowerOffAfterDataOff);
pw.println(" mPendingRadioPowerOffAfterDataOffTag=" + mPendingRadioPowerOffAfterDataOffTag);
- pw.println(" mCellLoc=" + mCellLoc);
- pw.println(" mNewCellLoc=" + mNewCellLoc);
+ pw.println(" mCellLoc=" + Rlog.pii(VDBG, mCellLoc));
+ pw.println(" mNewCellLoc=" + Rlog.pii(VDBG, mNewCellLoc));
pw.println(" mLastCellInfoListTime=" + mLastCellInfoListTime);
dumpCellInfoList(pw);
pw.flush();
diff --git a/src/java/com/android/internal/telephony/SmsNumberUtils.java b/src/java/com/android/internal/telephony/SmsNumberUtils.java
index f4e320b..ff65aea 100644
--- a/src/java/com/android/internal/telephony/SmsNumberUtils.java
+++ b/src/java/com/android/internal/telephony/SmsNumberUtils.java
@@ -530,10 +530,11 @@
* Filter the destination number if using VZW sim card.
*/
public static String filterDestAddr(Phone phone, String destAddr) {
- if (DBG) Rlog.d(TAG, "enter filterDestAddr. destAddr=\"" + destAddr + "\"" );
+ if (DBG) Rlog.d(TAG, "enter filterDestAddr. destAddr=\"" + Rlog.pii(TAG, destAddr) + "\"" );
if (destAddr == null || !PhoneNumberUtils.isGlobalPhoneNumber(destAddr)) {
- Rlog.w(TAG, "destAddr" + destAddr + " is not a global phone number! Nothing changed.");
+ Rlog.w(TAG, "destAddr" + Rlog.pii(TAG, destAddr) +
+ " is not a global phone number! Nothing changed.");
return destAddr;
}
@@ -553,7 +554,8 @@
if (DBG) {
Rlog.d(TAG, "destAddr is " + ((result != null)?"formatted.":"not formatted."));
- Rlog.d(TAG, "leave filterDestAddr, new destAddr=\"" + (result != null ? result : destAddr) + "\"" );
+ Rlog.d(TAG, "leave filterDestAddr, new destAddr=\"" + (result != null ? Rlog.pii(TAG,
+ result) : Rlog.pii(TAG, destAddr)) + "\"");
}
return result != null ? result : destAddr;
}
diff --git a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
index a1f304c..ad325ea 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
@@ -1017,7 +1017,8 @@
public void
onUssdFinished(String ussdMessage, boolean isUssdRequest) {
if (mState == State.PENDING) {
- if (ussdMessage == null) {
+ if (TextUtils.isEmpty(ussdMessage)) {
+ Rlog.d(LOG_TAG, "onUssdFinished: no network provided message; using default.");
mMessage = mContext.getText(com.android.internal.R.string.mmiComplete);
} else {
mMessage = ussdMessage;
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
index 3429367..af25a95 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
@@ -820,6 +820,9 @@
}
if (!mShouldIgnoreVideoStateChanges) {
+ if (mImsVideoCallProviderWrapper != null) {
+ mImsVideoCallProviderWrapper.onVideoStateChanged(newVideoState);
+ }
setVideoState(newVideoState);
changed = true;
} else {
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
index 104b6b0..b1013b1 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
@@ -998,7 +998,7 @@
void
onUssdFinished(String ussdMessage, boolean isUssdRequest) {
if (mState == State.PENDING) {
- if (ussdMessage == null) {
+ if (TextUtils.isEmpty(ussdMessage)) {
mMessage = mContext.getText(com.android.internal.R.string.mmiComplete);
Rlog.v(LOG_TAG, "onUssdFinished: no message; using: " + mMessage);
} else {
