commit | ad0e1b551097adc8caaa349ddfad433c8f87d354 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Dec 09 15:14:12 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 09 15:14:12 2024 +0000 |
tree | 8ba5d616d0b04bc4ce09bce51e89480f4fb07d60 | |
parent | b5d6f8446a7fd95264ca338116b0255ac663ac41 [diff] | |
parent | e88bee118f10d4a23ca72113d0f4bc605d3d708e [diff] |
Merge "Change the default value of the flag to true as discussed via chat" into main am: 9d32cba384 am: e88bee118f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3398620 Change-Id: Ic9b3be46dda6da2cc0431c109d94f11ff9cb2aac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java index 92b2b09..eef867c 100644 --- a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java +++ b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java
@@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.server.net.ct; import android.annotation.RequiresApi; @@ -36,7 +37,8 @@ */ public static boolean enabled(Context context) { return DeviceConfig.getBoolean( - Config.NAMESPACE_NETWORK_SECURITY, Config.FLAG_SERVICE_ENABLED, false) + Config.NAMESPACE_NETWORK_SECURITY, Config.FLAG_SERVICE_ENABLED, + /* defaultValue= */ true) && Flags.certificateTransparencyService(); }