| commit | a68fb57f2037e5925eb0fad49ede637ab04e20e6 | [log] [tgz] |
|---|---|---|
| author | Przemysław Szczepaniak <[email protected]> | Tue Oct 03 16:38:53 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue Oct 03 16:38:53 2023 +0000 |
| tree | 4f38cdbacb54a515da07941c0aae50d8aa398172 | |
| parent | bfa2f34dc976b01fcb569163a808569ae0178c44 [diff] | |
| parent | 6c6f5de3a0e37ad457237fb2937070d863e7afd2 [diff] |
[automerger skipped] Fix OOB Read in convertSubgraphFromHAL am: 2f2d04b7f3 -s ours am: ca4682c31c -s ours am: 33c03c87d3 -s ours am: 6c6f5de3a0 -s ours am skip reason: Merged-In I7a5f3780fafd12663693b74988baee6a9188041f with SHA-1 7eed49fb77 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/24343854 Change-Id: I8854c4790ed4493e2cc1c5b3a0372cae5e7545f2 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/runtime/Manager.cpp b/runtime/Manager.cpp index 75f6243..c3fada3 100644 --- a/runtime/Manager.cpp +++ b/runtime/Manager.cpp
@@ -91,7 +91,9 @@ bool getWhetherPlatformTelemetryIsEnabled() { #if !defined(NN_COMPATIBILITY_LIBRARY_BUILD) && !defined(NN_EXPERIMENTAL_FEATURE) - return getServerTelemetryEnableFlag(); + // b/287186978, force enable telemetry on the platform NNAPI + // return getServerTelemetryEnableFlag(); + return true; #else // !defined(NN_COMPATIBILITY_LIBRARY_BUILD) && !defined(NN_EXPERIMENTAL_FEATURE) return false; #endif // !defined(NN_COMPATIBILITY_LIBRARY_BUILD) && !defined(NN_EXPERIMENTAL_FEATURE)