drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improved the debug message"

Browse Source
This commit is contained in:
Jack Yu
2019-04-05 20:30:46 +00:00
committed by Gerrit Code Review
parent 0d4445f1e0 f85fa2fa6c
commit cacfab6728
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/TelephonyRegistry.java
View File

@ -248,6 +248,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
private final LocalLog mLocalLog = new LocalLog(100); private final LocalLog mLocalLog = new LocalLog(100);
private final LocalLog mListenLog = new LocalLog(100);
private PreciseDataConnectionState mPreciseDataConnectionState = private PreciseDataConnectionState mPreciseDataConnectionState =
new PreciseDataConnectionState(); new PreciseDataConnectionState();
@ -305,6 +307,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
mDefaultSubId = newDefaultSubId; mDefaultSubId = newDefaultSubId;
mDefaultPhoneId = newDefaultPhoneId; mDefaultPhoneId = newDefaultPhoneId;
mLocalLog.log("Default subscription updated: mDefaultPhoneId="
+ mDefaultPhoneId + ", mDefaultSubId" + mDefaultSubId);
} }
} }
} }
@ -598,10 +602,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
boolean notifyNow, int subId) { boolean notifyNow, int subId) {
int callerUserId = UserHandle.getCallingUserId(); int callerUserId = UserHandle.getCallingUserId();
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage); mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
if (VDBG) { String str = "listen: E pkg=" + callingPackage + " events=0x" + Integer.toHexString(events)
log("listen: E pkg=" + callingPackage + " events=0x" + Integer.toHexString(events)
+ " notifyNow=" + notifyNow + " subId=" + subId + " myUserId=" + " notifyNow=" + notifyNow + " subId=" + subId + " myUserId="
+ UserHandle.myUserId() + " callerUserId=" + callerUserId); + UserHandle.myUserId() + " callerUserId=" + callerUserId;
mListenLog.log(str);
if (VDBG) {
log(str);
} }
if (events != PhoneStateListener.LISTEN_NONE) { if (events != PhoneStateListener.LISTEN_NONE) {
@ -1399,8 +1405,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (PhoneConstants.APN_TYPE_DEFAULT.equals(apnType) if (PhoneConstants.APN_TYPE_DEFAULT.equals(apnType)
&& (mDataConnectionState[phoneId] != state && (mDataConnectionState[phoneId] != state
|| mDataConnectionNetworkType[phoneId] != networkType)) { || mDataConnectionNetworkType[phoneId] != networkType)) {
String str = "onDataConnectionStateChanged(" + state String str = "onDataConnectionStateChanged("
+ ", " + networkType + ")"; + TelephonyManager.dataStateToString(state)
+ ", " + TelephonyManager.getNetworkTypeName(networkType)
+ ") subId=" + subId + ", phoneId=" + phoneId;
log(str); log(str);
mLocalLog.log(str); mLocalLog.log(str);
for (Record r : mRecords) { for (Record r : mRecords) {
@ -1916,12 +1924,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
pw.println("mEmergencyNumberList=" + mEmergencyNumberList); pw.println("mEmergencyNumberList=" + mEmergencyNumberList);
pw.println("mCallQuality=" + mCallQuality); pw.println("mCallQuality=" + mCallQuality);
pw.println("mCallAttributes=" + mCallAttributes); pw.println("mCallAttributes=" + mCallAttributes);
pw.println("mDefaultPhoneId" + mDefaultPhoneId);
pw.println("mDefaultSubId" + mDefaultSubId);
pw.decreaseIndent(); pw.decreaseIndent();
pw.println("local logs:"); pw.println("local logs:");
pw.increaseIndent(); pw.increaseIndent();
mLocalLog.dump(fd, pw, args); mLocalLog.dump(fd, pw, args);
pw.println("listen logs:");
mListenLog.dump(fd, pw, args);
pw.decreaseIndent(); pw.decreaseIndent();
pw.println("registrations: count=" + recordCount); pw.println("registrations: count=" + recordCount);
pw.increaseIndent(); pw.increaseIndent();

18
telephony/java/android/telephony/TelephonyManager.java
View File

@ -2647,7 +2647,7 @@ public class TelephonyManager {
*/ */
/** {@hide} */ /** {@hide} */
@UnsupportedAppUsage @UnsupportedAppUsage
public static String getNetworkTypeName(int type) { public static String getNetworkTypeName(@NetworkType int type) {
switch (type) { switch (type) {
case NETWORK_TYPE_GPRS: case NETWORK_TYPE_GPRS:
return "GPRS"; return "GPRS";
@ -4788,6 +4788,22 @@ public class TelephonyManager {
} }
} }
/**
* Convert data state to string
*
* @return The data state in string format.
* @hide
*/
public static String dataStateToString(@DataState int state) {
switch (state) {
case DATA_DISCONNECTED: return "DISCONNECTED";
case DATA_CONNECTING: return "CONNECTING";
case DATA_CONNECTED: return "CONNECTED";
case DATA_SUSPENDED: return "SUSPENDED";
}
return "UNKNOWN(" + state + ")";
}
/** /**
* @hide * @hide
*/ */