diff options
| author | Ying Wang <wangying@google.com> | 2010-01-04 13:49:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-04 13:49:47 -0800 |
| commit | 24c10062cdced5ab9b2abd418bca22f5cce09066 (patch) | |
| tree | 59f03306ff3f33186bc293ee11b09d9971eee2e6 /core/java | |
| parent | 1337b012f8e18c725b1ec17b456dc57a084d594d (diff) | |
| parent | 5c529a0cb587d0dfa38e5642e268ca56285a356f (diff) | |
| download | frameworks_base-24c10062cdced5ab9b2abd418bca22f5cce09066.zip frameworks_base-24c10062cdced5ab9b2abd418bca22f5cce09066.tar.gz frameworks_base-24c10062cdced5ab9b2abd418bca22f5cce09066.tar.bz2 | |
am 5c529a0c: am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '5c529a0cb587d0dfa38e5642e268ca56285a356f'
* commit '5c529a0cb587d0dfa38e5642e268ca56285a356f':
Rename ro.monkey to monkey.running
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/accounts/AccountManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java index 54e0375..fc72f9a 100644 --- a/core/java/android/accounts/AccountManagerService.java +++ b/core/java/android/accounts/AccountManagerService.java @@ -155,7 +155,7 @@ public class AccountManagerService new AtomicReference<AccountManagerService>(); private static final boolean isDebuggableMonkeyBuild = - SystemProperties.getBoolean("ro.monkey", false) + SystemProperties.getBoolean("monkey.running", false) && SystemProperties.getBoolean("ro.debuggable", false); private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[]{}; |