diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-05-30 10:14:40 -0700 |
|---|---|---|
| committer | Tim Kilbourn <tkilbourn@google.com> | 2014-05-30 10:14:40 -0700 |
| commit | 505b28c105b01f63f0ea4ba702f3ad834c9df3f3 (patch) | |
| tree | f00464b20828b536a2a1a01faa98f7a341523e46 /policy | |
| parent | e7070b30b535d681b1633256744136872e1a3566 (diff) | |
| parent | 1d285b091bef26cec7e9bedc60f6b549608dc9a0 (diff) | |
| download | frameworks_base-505b28c105b01f63f0ea4ba702f3ad834c9df3f3.zip frameworks_base-505b28c105b01f63f0ea4ba702f3ad834c9df3f3.tar.gz frameworks_base-505b28c105b01f63f0ea4ba702f3ad834c9df3f3.tar.bz2 | |
resolved conflicts for merge of dfd39a7f to master
Change-Id: I51040a2e7de006a9864127bdff839dbadbf00879
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/GlobalKeyManager.java | 18 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalKeyManager.java b/policy/src/com/android/internal/policy/impl/GlobalKeyManager.java index 3cf7e82..8c8209f 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalKeyManager.java +++ b/policy/src/com/android/internal/policy/impl/GlobalKeyManager.java @@ -30,6 +30,7 @@ import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import java.io.PrintWriter; /** * Stores a mapping of global keys. @@ -123,4 +124,21 @@ final class GlobalKeyManager { } } } + + public void dump(String prefix, PrintWriter pw) { + final int numKeys = mKeyMapping.size(); + if (numKeys == 0) { + pw.print(prefix); pw.println("mKeyMapping.size=0"); + return; + } + pw.print(prefix); pw.println("mKeyMapping={"); + for (int i = 0; i < numKeys; ++i) { + pw.print(" "); + pw.print(prefix); + pw.print(KeyEvent.keyCodeToString(mKeyMapping.keyAt(i))); + pw.print("="); + pw.println(mKeyMapping.valueAt(i).flattenToString()); + } + pw.print(prefix); pw.println("}"); + } } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index fb041fa..e1604f4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5678,6 +5678,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock); pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation); + mGlobalKeyManager.dump(prefix, pw); mStatusBarController.dump(pw, prefix); mNavigationBarController.dump(pw, prefix); PolicyControl.dump(prefix, pw); |