Commit graph

4588 commits

Author SHA1 Message Date
Kenny Root
2a36ae5608 am 7b88a90d: Merge "Remove HAVE_SELINUX guards"
* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
  Remove HAVE_SELINUX guards
2012-10-17 09:57:10 -07:00
Kenny Root
7b88a90da2 Merge "Remove HAVE_SELINUX guards" 2012-10-17 09:35:56 -07:00
Kenny Root
b5982bf7c6 Remove HAVE_SELINUX guards
Change-Id: I8272c573b3c5dc663203bafab68fad5e94d89364
2012-10-16 23:18:18 -07:00
Kenny Root
20f5daa865 resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
2012-10-16 17:51:14 -07:00
Kenny Root
44f4f8a4d2 Merge "Remove HAVE_SELINUX guards" 2012-10-16 16:33:45 -07:00
Kenny Root
b83c09812f Remove HAVE_SELINUX guards
Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
2012-10-16 12:34:06 -07:00
Todd Poynor
d943017995 am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
* commit 'c907ce77a099f28b07b754e9f69619adbe1e345f':
  init.trace.rc: Set perms for power/clock_set_rate events
2012-10-15 20:18:52 -07:00
Jean-Michel Trivi
28b032c939 am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
* commit '7908567b642ec5a49b9d0baa7e0285cc742ced61':
  Remove force use definition for remote audio submix
2012-10-15 20:17:59 -07:00
Todd Poynor
c907ce77a0 am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
* commit '7b4aa677b1860b9a83f9cde7d71ca0d5bc193422':
  init.trace.rc: Set perms for power/clock_set_rate events
2012-10-15 17:38:26 -07:00
Todd Poynor
7b4aa677b1 Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev 2012-10-15 17:36:12 -07:00
Todd Poynor
4ef6e4baa9 init.trace.rc: Set perms for power/clock_set_rate events
Bug: 7351763

Change-Id: I1ee3d7c9b55d1b55df6cafb1bf21f9139d964646
2012-10-15 17:16:55 -07:00
Jean-Michel Trivi
7908567b64 am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
* commit '14075567de367bd109a256514119fc16e8d4cf67':
  Remove force use definition for remote audio submix
2012-10-15 16:28:02 -07:00
Jean-Michel Trivi
14075567de Merge "Remove force use definition for remote audio submix" into jb-mr1-dev 2012-10-15 16:26:28 -07:00
The Android Open Source Project
133155e3d8 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ie75896ec89b34fe067a2d1c6b34309629459228b
2012-10-15 07:40:44 -07:00
Kenny Root
1dcaf9d054 am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin"
* commit '51ccef27cab58277775e62518a59666d2a059b62':
  Add TEMP_FAILURE_RETRY macro for darwin
2012-10-13 13:54:34 -07:00
Kenny Root
51ccef27ca Merge "Add TEMP_FAILURE_RETRY macro for darwin" 2012-10-13 13:12:40 -07:00
Kenny Root
89c2812bd6 Add TEMP_FAILURE_RETRY macro for darwin
Darwin doesn't define the TEMP_FAILURE_RETRY macro in unistd.h so we
need to add it everywhere. Joy!

(cherry picked from commit ec90f1dc11)

Change-Id: Ida554fc65193672cc4616dec79e6282e06cc1b28
2012-10-13 12:35:03 -07:00
Kenny Root
1dc92bacb8 am 207c17ff: Merge "Make adb robust against EINTR"
* commit '207c17ff1f48d0db3c69628bb036a14db40b5887':
  Make adb robust against EINTR
2012-10-12 23:59:22 -07:00
Kenny Root
207c17ff1f Merge "Make adb robust against EINTR" 2012-10-12 23:45:47 -07:00
The Android Automerger
b151510bee merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:43 -07:00
The Android Automerger
a26ee499a7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:33:07 -07:00
Dima Zavin
657cd83899 am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank
* commit '9b4a9312dc1c158ae28ce3f3a2f6ebf16fd94ff1':
  charger: allow devices to skip the initial display blank
2012-10-12 15:53:48 -07:00
Dima Zavin
9b4a9312dc am 209c7b0f: charger: allow devices to skip the initial display blank
* commit '209c7b0fad9604d1dde1b74d9f9d577b923469fd':
  charger: allow devices to skip the initial display blank
2012-10-12 15:52:07 -07:00
Kenny Root
73167412bc Make adb robust against EINTR
Change-Id: I39a8d9007ce2d5662a33a50e4d7e2e7f8f9fad63
2012-10-12 15:28:37 -07:00
Dima Zavin
209c7b0fad charger: allow devices to skip the initial display blank
The theory behind the blank was that the kernel would not
re-initilize the display on boot (and leave it to whatever
the bootloader configured it to) until after the first
blank request.

On some devices, the bootloader does not turn the screen on,
but it's done by the kernel and thus. This makes the extra blank at
start unnecessary.

Bug: 7319529
Change-Id: I9ad9856186df6e9e23ebbe86e83b641423e16dcb
Signed-off-by: Dima Zavin <dima@android.com>
2012-10-12 15:13:52 -07:00
The Android Open Source Project
e34e9e498a Reconcile with jb-mr1-factory-release - do not merge
Change-Id: I8c44904def148550022af390ceda87a2d4007c48
2012-10-12 07:32:27 -07:00
Jean-Michel Trivi
371fc00fc5 Remove force use definition for remote audio submix
Obsolete.

Bug 7318180

Change-Id: I3421ca554a4131d606bdee698aeb7b2091a5d966
2012-10-11 19:13:58 -07:00
The Android Automerger
32429a93d4 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:56 -07:00
The Android Open Source Project
436faffe3c Reconcile with jb-mr1-release - do not merge
Change-Id: I7ec0e7696f2f2004f75d5b83f86ea6d890e0cd3d
2012-10-11 08:06:18 -07:00
The Android Automerger
f3f1d01675 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:04:29 -07:00
Kenny Root
e47eb98a33 am 674c0445: Merge "toolbox: silence some compiler warnings"
* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
  toolbox: silence some compiler warnings
2012-10-11 00:29:10 -07:00
Kenny Root
674c0445e2 Merge "toolbox: silence some compiler warnings" 2012-10-11 00:03:53 -07:00
Matthew Xie
41f0e1a725 am f1bb0a95: am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack
* commit 'f1bb0a95b91a8a75c7ca653a40bb56f1122afbba':
  Change dev/uhid group id from bluetooth to net_bt_stack
2012-10-10 15:40:47 -07:00
Matthew Xie
f1bb0a95b9 am bdec5ead: Change dev/uhid group id from bluetooth to net_bt_stack
* commit 'bdec5ead7417769ba9fc75b6ca86d191b49f2be8':
  Change dev/uhid group id from bluetooth to net_bt_stack
2012-10-10 15:38:52 -07:00
Matthew Xie
bdec5ead74 Change dev/uhid group id from bluetooth to net_bt_stack
Secondary user need that group id to access the file to support hid
bug 7315419

Change-Id: I9d2d3d5a5114d289dc4d83c697421622db4beae6
2012-10-10 15:18:28 -07:00
Kenny Root
ef5d0340e4 toolbox: silence some compiler warnings
Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.

Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
2012-10-10 11:28:27 -07:00
The Android Open Source Project
1595c5a8b8 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I3f20206be34b065992e47210bf5a10b3c4bfcfb9
2012-10-10 09:46:03 -07:00
The Android Automerger
7f9349da1f merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 09:04:30 -07:00
The Android Automerger
035649eb10 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:55 -07:00
The Android Automerger
a0941d2c81 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 16:07:28 -07:00
The Android Automerger
bd0816f54b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 15:39:30 -07:00
Eric Laurent
90b530070a am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev
* commit '074f11c21da1f6897a750125e87cc478c0e983ee':
  audio policy: add forced uses for system
2012-10-09 11:32:31 -07:00
Eric Laurent
074f11c21d am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev
* commit 'd22b2a1f35153058bbc5ce664fc9740adda8bcb7':
  audio policy: add forced uses for system
2012-10-09 11:30:54 -07:00
Eric Laurent
d22b2a1f35 Merge "audio policy: add forced uses for system" into jb-mr1-dev 2012-10-09 11:28:23 -07:00
Eric Laurent
4daa843432 audio policy: add forced uses for system
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.

Bug 7032634.

Change-Id: Ib1834ec507f3aa726895b8fd3e8a91cc9cc601a7
2012-10-09 09:39:03 -07:00
The Android Open Source Project
6c631f7a4d Reconcile with jb-mr1-release - do not merge
Change-Id: I71bc832ed089ae690aecfc96672986fc09712a58
2012-10-09 07:31:04 -07:00
The Android Automerger
fb2f28271b merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 07:00:02 -07:00
Dima Zavin
9b40be2a6e am a6b429d4: am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
* commit 'a6b429d4f19aead36a04f0103a2bd687f5ccaeb8':
  rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
2012-10-08 11:32:46 -07:00
Dima Zavin
a6b429d4f1 am c6f8bd39: Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
* commit 'c6f8bd396614d422d80ac9f24c91fa44a713894a':
  rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
2012-10-08 11:31:28 -07:00
Dima Zavin
c6f8bd3966 Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev 2012-10-08 11:30:36 -07:00