diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-10 21:15:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-10 21:15:15 +0000 |
| commit | 064fab54d743c6b00319ec08669e8b0872625317 (patch) | |
| tree | ed74a60ebe7f6934d4748589da13b6dc8eae930b | |
| parent | f7104136927f45e152cec3583463b8ef1570df7b (diff) | |
| parent | 2323dd8d1e2564e5a7b912bf57838802571e8777 (diff) | |
| download | frameworks_base-064fab54d743c6b00319ec08669e8b0872625317.zip frameworks_base-064fab54d743c6b00319ec08669e8b0872625317.tar.gz frameworks_base-064fab54d743c6b00319ec08669e8b0872625317.tar.bz2 | |
Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Process.java | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 4236eae..5ac9a65 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16835,7 +16835,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 diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index facab4c..476b4ea 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -166,11 +166,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 * {@link #setThreadPriority(int, int)}, <b>not</b> with the normal |