summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michal Karpinski <mkarpinski@google.com> 2019-02-27 13:10:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-27 13:10:12 +0000
commit750c23d5415c3d012edf2bf91a49098de691091c (patch)
treed339a3c063b02a0d6e0a9ca637b4b0f0e5cbf762
parent510945d8cbd898969e571b074fb49ef400e9f1c5 (diff)
parentb639402f5b518af67f158a71b8241a5277a69ad7 (diff)
Merge "Default ACTIVITY_STARTS_LOGGING_ENABLED flag to 1"
-rw-r--r--core/java/android/provider/Settings.java2
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerConstants.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 10e4ebe430c1..a1d1cd9bfd87 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -11416,7 +11416,7 @@ public final class Settings {
/**
* Feature flag to enable or disable the activity starts logging feature.
* Type: int (0 for false, 1 for true)
- * Default: 0
+ * Default: 1
* @hide
*/
public static final String ACTIVITY_STARTS_LOGGING_ENABLED
diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java
index d025d739055b..de41152570d8 100644
--- a/services/core/java/com/android/server/am/ActivityManagerConstants.java
+++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java
@@ -402,7 +402,7 @@ final class ActivityManagerConstants extends ContentObserver {
private void updateActivityStartsLoggingEnabled() {
mFlagActivityStartsLoggingEnabled = Settings.Global.getInt(mResolver,
- Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED, 0) == 1;
+ Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED, 1) == 1;
}
private void updateBackgroundActivityStartsEnabled() {