Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce232b4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats... 

am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev

* commit '5a4b4084':
  Fix issue android-app doc, bump battery stats checkin version
parents cefeb34e 5a4b4084

core/java/android/content/Intent.java

+5 −3
Original line number Diff line number Diff line
@@ -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>

     *

core/java/android/os/BatteryStats.java

+1 −1
Original line number Diff line number Diff line
@@ -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();