From 59af7a82fa7a033d4d3ec06ad5650023fae07a20 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Mon, 24 Apr 2017 15:11:43 +0100 Subject: [PATCH] Update SystemUpdatePolicy wording Make supporting security patch behaviour optional Bug: 37266712 Test: make -j32 docs Change-Id: Ied73b386396169d83bd152fcb882926f3222b599 --- core/java/android/app/admin/SystemUpdatePolicy.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/java/android/app/admin/SystemUpdatePolicy.java b/core/java/android/app/admin/SystemUpdatePolicy.java index 28704e636f19..995d98a7bb36 100644 --- a/core/java/android/app/admin/SystemUpdatePolicy.java +++ b/core/java/android/app/admin/SystemUpdatePolicy.java @@ -71,11 +71,12 @@ public class SystemUpdatePolicy implements Parcelable { public static final int TYPE_INSTALL_WINDOWED = 2; /** - * Incoming system updates (except for security updates) will be blocked for 30 days, after - * which the policy will no longer be effective and the system will revert back to its normal - * behavior as if no policy were set. - * Note: security updates (e.g. monthly security patches) will not be affected by - * this policy. + * Incoming system updates (except for security updates) will be blocked for a maximum of 30 + * days, after which the policy will no longer be effective and the system will revert back to + * its normal behavior as if no policy were set. + * + *

Note: security updates (e.g. monthly security patches) may not be affected + * by this policy, depending on the policy set by the device manufacturer and carrier. * *

After this policy expires, resetting it to any policy other than * {@link #TYPE_INSTALL_AUTOMATIC} will produce no effect, as the 30-day maximum delay has -- 2.11.0