commit 67bea71a2fa32ae6effb069b8bd35031addea325
author Yi Kong <yikong@google.com> Thu Apr 29 04:02:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 29 04:02:10 2021 +0000
tree 712c2a759af9e291c6abfc9e4840676b28b43d55
parent cadc1f60865b7ed44b7834254c9f95eb3649fbf9
parent 8bcd420ab5fa9d9ff22c7005a1359778905bd98f

Merge "profcollect: alternative property to start profcollectd"

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

diff --git a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
index 75432cd..9706d7f 100644
--- a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
+++ b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
@@ -29,6 +29,7 @@
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.os.UpdateEngine;
 import android.os.UpdateEngineCallback;
 import android.os.UserHandle;
@@ -79,7 +80,7 @@
      */
     public static boolean enabled() {
         return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, "enabled",
-            false);
+            false) || SystemProperties.getBoolean("persist.profcollectd.enabled_override", false);
     }
 
     @Override