am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2

* commit 'ee3de4a950a188c6a4d5fb732242249af4807837': Remove compat mode dialog.
2011-06-07 15:56:05 -07:00
parent 891266e36e ee3de4a950
commit 816e5b7219
1 changed files with 1 additions and 1 deletions
--- 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(