diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-07 15:45:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 15:45:14 -0700 |
| commit | a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5 (patch) | |
| tree | d2cc643da20879cf0d489e4cb959e7340c178bd5 /services | |
| parent | dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af (diff) | |
| parent | 29478269319502c92d04979411120bf49d2d011f (diff) | |
| download | frameworks_base-a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5.zip frameworks_base-a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5.tar.gz frameworks_base-a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5.tar.bz2 | |
Merge "Remove compat mode dialog." into honeycomb-mr2
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( |