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

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

am a92e95e5: am 064fab54: Merge "Fix issue #7691456: adbd CPU usage identified... 

am a92e95e5: am 064fab54: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

* commit 'a92e95e5':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
parents b484e37e a92e95e5

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -16838,7 +16838,6 @@ package android.os { 
    method public static final void setThreadPriority(int, int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;

    method public static final void setThreadPriority(int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;

    method public static final deprecated boolean supportsProcesses();

    field public static final int BLUETOOTH_GID = 2000; // 0x7d0

    field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710

    field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f

    field public static final int PHONE_UID = 1001; // 0x3e9

core/java/android/os/Process.java

+0 −5
Original line number Diff line number Diff line
@@ -165,11 +165,6 @@ public class Process { 
     */

    public static final int LAST_SHARED_APPLICATION_GID = 59999;



    /**

     * Defines a secondary group id for access to the bluetooth hardware.

     */

    public static final int BLUETOOTH_GID = 2000;



    /**

     * Standard priority of application threads.

     * Use with {@link #setThreadPriority(int)} and