Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update SystemUpdatePolicy wording" into oc-dev

Browse Source 
am: 7cf5f74f3f

Change-Id: Ifac890402f5f352d00ccb5eb3809b67a125d2b24
This commit is contained in:
Rubin Xu
2017-05-09 11:57:57 +00:00
committed by android-build-merger
parent d1ea33a039 7cf5f74f3f
commit 0311911b9e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/admin/SystemUpdatePolicy.java
View File

@@ -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.
* <b>Note:</b> security updates (e.g. monthly security patches) will <i>not</i> 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.
*
* <p><b>Note:</b> security updates (e.g. monthly security patches) may <i>not</i> be affected
* by this policy, depending on the policy set by the device manufacturer and carrier.
*
* <p>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