Merge commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee' * commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee': Rename ro.monkey to monkey.running
This commit is contained in:
@@ -76,7 +76,7 @@ public class DevelopmentSettings extends PreferenceActivity
|
|||||||
|
|
||||||
// Those monkeys kept committing suicide, so we add this property
|
// Those monkeys kept committing suicide, so we add this property
|
||||||
// to disable this functionality
|
// to disable this functionality
|
||||||
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
|
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -206,7 +206,7 @@ public class LanguageSettings extends PreferenceActivity {
|
|||||||
// Input Method stuff
|
// Input Method stuff
|
||||||
// Those monkeys kept committing suicide, so we add this property
|
// Those monkeys kept committing suicide, so we add this property
|
||||||
// to disable this functionality
|
// to disable this functionality
|
||||||
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
|
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -63,7 +63,7 @@ public class MasterClear extends Activity {
|
|||||||
|
|
||||||
// Those monkeys kept committing suicide, so we add this property
|
// Those monkeys kept committing suicide, so we add this property
|
||||||
// to disable going through with the master clear
|
// to disable going through with the master clear
|
||||||
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
|
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -63,7 +63,7 @@ public class MediaFormat extends Activity {
|
|||||||
|
|
||||||
// Those monkeys kept committing suicide, so we add this property
|
// Those monkeys kept committing suicide, so we add this property
|
||||||
// to disable going through with the format
|
// to disable going through with the format
|
||||||
if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
|
if (!TextUtils.isEmpty(SystemProperties.get("monkey.running"))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
IMountService service =
|
IMountService service =
|
||||||
|
Reference in New Issue
Block a user