diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-07 15:47:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 15:47:14 -0700 |
| commit | ee3de4a950a188c6a4d5fb732242249af4807837 (patch) | |
| tree | 9cad62f18a24e6a8b588b432bff01fe6bef89c2a /services | |
| parent | b5b98f877a09907a9a3b0c7e590e6e0ddd575158 (diff) | |
| parent | a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5 (diff) | |
| download | frameworks_base-ee3de4a950a188c6a4d5fb732242249af4807837.zip frameworks_base-ee3de4a950a188c6a4d5fb732242249af4807837.tar.gz frameworks_base-ee3de4a950a188c6a4d5fb732242249af4807837.tar.bz2 | |
am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index c503fb8..1a333ba 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -1286,7 +1286,7 @@ public final class ActivityManagerService extends ActivityManagerNative mCompatModeDialog.dismiss(); mCompatModeDialog = null; } - if (ar != null) { + if (ar != null && false) { if (mCompatModePackages.getPackageAskCompatModeLocked( ar.packageName)) { int mode = mCompatModePackages.computeCompatModeLocked( |