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

Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-01-15 01:38:22 +00:00
committed by Android (Google) Code Review
parent 53af1cd393 0ee10f6d26
commit b96a6916f6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/Intent.java
View File

@@ -3949,10 +3949,12 @@ public class Intent implements Parcelable, Cloneable {
* is: * is:
* *
* <pre class="prettyprint"> * <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 * <p>In this scheme, only the <code>package_id</code> is required. If you include a host,
* other components can be included as desired. Note that this can not be * 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 * used with intents that have a {@link #setSelector}, since the base intent
* will always have an explicit package name.</p> * will always have an explicit package name.</p>
* *

2
core/java/android/os/BatteryStats.java
View File

@@ -4083,7 +4083,7 @@ public abstract class BatteryStats implements Parcelable {
prepareForDumpLocked(); prepareForDumpLocked();
dumpLine(pw, 0 /* uid */, "i" /* category */, VERSION_DATA, dumpLine(pw, 0 /* uid */, "i" /* category */, VERSION_DATA,
"11", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion()); "12", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion());
long now = getHistoryBaseTime() + SystemClock.elapsedRealtime(); long now = getHistoryBaseTime() + SystemClock.elapsedRealtime();