am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev

* commit 'c6fbad006a4c9385670ec7c26e71a802bf1f608b':
  Make all monkeys do the same thing
This commit is contained in:
Brian Muramatsu
2012-10-09 19:14:50 -07:00
committed by Android Git Automerger

View File

@@ -516,6 +516,10 @@ public class Monkey {
mMainCategories.add(Intent.CATEGORY_MONKEY); mMainCategories.add(Intent.CATEGORY_MONKEY);
} }
if (mSeed == 0) {
mSeed = System.currentTimeMillis() + System.identityHashCode(this);
}
if (mVerbose > 0) { if (mVerbose > 0) {
System.out.println(":Monkey: seed=" + mSeed + " count=" + mCount); System.out.println(":Monkey: seed=" + mSeed + " count=" + mCount);
if (mValidPackages.size() > 0) { if (mValidPackages.size() > 0) {
@@ -550,8 +554,7 @@ public class Monkey {
return -4; return -4;
} }
mRandom = new SecureRandom(); mRandom = new Random(mSeed);
mRandom.setSeed((mSeed == 0) ? -1 : mSeed);
if (mScriptFileNames != null && mScriptFileNames.size() == 1) { if (mScriptFileNames != null && mScriptFileNames.size() == 1) {
// script mode, ignore other options // script mode, ignore other options