diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 8 | ||||
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5ebbf16..af7ec5e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3949,10 +3949,12 @@ public class Intent implements Parcelable, Cloneable { * is: * * <pre class="prettyprint"> - * android-app://{package_id}/{scheme}/{host}/{path}{#Intent;...}</pre> + * android-app://{package_id}[/{scheme}[/{host}[/{path}]]][#Intent;{...}]</pre> * - * <p>In this scheme, only the <code>pacakge_id</code> is required, and all - * other components can be included as desired. Note that this can not be + * <p>In this scheme, only the <code>package_id</code> is required. If you include a host, + * you must also include a scheme; including a path also requires both a host and a scheme. + * The final #Intent; fragment can be used without a scheme, host, or path. + * Note that this can not be * used with intents that have a {@link #setSelector}, since the base intent * will always have an explicit package name.</p> * diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index c0dca0e..cd45cfb 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -4083,7 +4083,7 @@ public abstract class BatteryStats implements Parcelable { prepareForDumpLocked(); dumpLine(pw, 0 /* uid */, "i" /* category */, VERSION_DATA, - "11", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion()); + "12", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion()); long now = getHistoryBaseTime() + SystemClock.elapsedRealtime(); |