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

am 17cfb5ec: am af5b992c: am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

Browse Source 
* commit '17cfb5ec67e739b3d61342472f2c6568118c3884':
  Add a dumpsys for KeyguardUpdateMonitor
This commit is contained in:
Jason Monk
2015-07-14 00:51:38 +00:00
committed by Android Git Automerger
parent b63aa8a997 17cfb5ec67
commit 5c4fcbbb3f
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -67,6 +67,8 @@ import android.util.SparseIntArray;
import com.google.android.collect.Lists;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
@@ -1397,4 +1399,22 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
}
return null; // not found
}
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println("KeyguardUpdateMonitor state:");
pw.println(" SIM States:");
for (SimData data : mSimDatas.values()) {
pw.println(" " + data.toString());
}
pw.println(" Subs:");
if (mSubscriptionInfo != null) {
for (int i = 0; i < mSubscriptionInfo.size(); i++) {
pw.println(" " + mSubscriptionInfo.get(i));
}
}
pw.println(" Service states:");
for (int subId : mServiceStates.keySet()) {
pw.println(" " + subId + "=" + mServiceStates.get(subId));
}
}
}

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -98,6 +98,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.NotificationVisibility;
import com.android.internal.statusbar.StatusBarIcon;
import com.android.keyguard.KeyguardHostView.OnDismissAction;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.BatteryMeterView;
import com.android.systemui.DemoMode;
@@ -2704,6 +2705,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} else {
pw.println(" mHeadsUpManager: null");
}
if (KeyguardUpdateMonitor.getInstance(mContext) != null) {
KeyguardUpdateMonitor.getInstance(mContext).dump(fd, pw, args);
}
pw.println("SharedPreferences:");
for (Map.Entry<String, ?> entry : Prefs.getAll(mContext).entrySet()) {