diff options
| author | Ying Wang <wangying@google.com> | 2010-01-07 09:21:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-07 09:21:40 -0800 |
| commit | 1060147d5c3599f5035234dd2df28467495bfcc1 (patch) | |
| tree | bf8527b606e43a1d4fea6c2a7d66611ebe6884bc /core/java | |
| parent | 2e4ce0fc6d3534bc490f6d6d0bdfb2b6a18caa49 (diff) | |
| parent | 80410b55f1eccf345fb6a01ca9a277935ac4098f (diff) | |
am 80410b55: am 42c98ada: Still use ro.monkey
Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f'
* commit '80410b55f1eccf345fb6a01ca9a277935ac4098f':
Still use ro.monkey
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/accounts/AccountManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java index fc72f9a3f083..d5a9b0215ac0 100644 --- a/core/java/android/accounts/AccountManagerService.java +++ b/core/java/android/accounts/AccountManagerService.java @@ -155,8 +155,7 @@ public class AccountManagerService new AtomicReference<AccountManagerService>(); private static final boolean isDebuggableMonkeyBuild = - SystemProperties.getBoolean("monkey.running", false) - && SystemProperties.getBoolean("ro.debuggable", false); + SystemProperties.getBoolean("ro.monkey", false); private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[]{}; static { |