diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-03 22:04:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-03 22:04:44 +0000 |
| commit | f0abed57397c18f71efe47f02aa69a719390adb5 (patch) | |
| tree | 98b2454b7535c122dd0687021276332263103c92 /core/java | |
| parent | 3e8105e212e65005c0ef0ecc345b47eb0bf129bd (diff) | |
| parent | d318e0b19f44697712b2824b8d685349a5b92000 (diff) | |
| download | frameworks_base-f0abed57397c18f71efe47f02aa69a719390adb5.zip frameworks_base-f0abed57397c18f71efe47f02aa69a719390adb5.tar.gz frameworks_base-f0abed57397c18f71efe47f02aa69a719390adb5.tar.bz2 | |
Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Intent.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d7ca915..dfc0412 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3300,8 +3300,10 @@ public class Intent implements Parcelable, Cloneable { /** * Optional extra for {@link #ACTION_SHUTDOWN} that allows the sender to qualify that * this shutdown is only for the user space of the system, not a complete shutdown. - * Hardware should not be shut down when this is true. The default if not supplied - * is false. + * When this is true, hardware devices can use this information to determine that + * they shouldn't do a complete shutdown of their device since this is not a + * complete shutdown down to the kernel, but only user space restarting. + * The default if not supplied is false. */ public static final String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY"; |