Commit graph

5230 commits

Author SHA1 Message Date
Igor Murashkin
fbb4a5ac1b am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit 'fba6c12a3e6ac5fabe91270293b1115f72fd48a1':
  graphics.h: add new Y8, Y16 formats
2013-02-11 11:20:53 -08:00
Igor Murashkin
fba6c12a3e Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev 2013-02-11 19:16:16 +00:00
The Android Automerger
d14283ffcf merge in jb-mr2-release history after reset to master 2013-02-11 07:12:46 -08:00
Igor Murashkin
9e00e66ebc graphics.h: add new Y8, Y16 formats
Change-Id: I0cb3786d91f442b5f3b665dd78bf5f0dd4ae4cf0
2013-02-08 13:40:59 -08:00
Rom Lemarchand
2f34c5033e logwrap: Change semantics of NULL status in android_fork_execvp
When passing a NULL status to android_fork_execvp the return
status will now be the return value of the child if it exited
properly, otherwise a non-0 value will be returned.

Change-Id: I13309c61b37b6b3f9d5507f7d6484e7b6baaf8d0
2013-02-08 09:37:52 -08:00
The Android Automerger
ce2482413c merge in jb-mr2-release history after reset to master 2013-02-07 07:11:36 -08:00
Jeffrey Brown
c5c410fe3d am 4b9bdd33: am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '4b9bdd333362c1f58260c37306f1902fb215f7bf':
  [MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:59:56 -08:00
Jeffrey Brown
caf9ae2db3 am 32fb9fed: am 1b9a6057: am 44508515: Merge "Tidy up long lines"
# By Duane Sand
# Via Android Git Automerger (2) and others
* commit '32fb9fed1ed954beb8fcadff9d09e0e1374fb145':
  Tidy up long lines
2013-02-06 20:59:54 -08:00
Jeffrey Brown
4b9bdd3333 am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '90dd14029414af26e64e3232f37c84feaa317ea8':
  [MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:57:06 -08:00
Jeffrey Brown
32fb9fed1e am 1b9a6057: am 44508515: Merge "Tidy up long lines"
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '1b9a60574028fd1dd77d6c07efb369ecaaf91218':
  Tidy up long lines
2013-02-06 20:57:05 -08:00
Jeffrey Brown
90dd140294 am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '241194cad4b27ffd1cb574cb10c4c6941ef3882f':
  [MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:54:02 -08:00
Jeffrey Brown
1b9a605740 am 44508515: Merge "Tidy up long lines"
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '445085151cff012efefc329b9fa1a311d1d208be':
  Tidy up long lines
2013-02-06 20:54:01 -08:00
Jeffrey Brown
241194cad4 Merge "[MIPS] Benchmark test for MIPS memset16/memset32" 2013-02-07 04:40:05 +00:00
Jeffrey Brown
445085151c Merge "Tidy up long lines" 2013-02-07 04:32:19 +00:00
The Android Automerger
2ea3688b1b merge in jb-mr2-release history after reset to master 2013-02-05 07:11:39 -08:00
Jean-Baptiste Queru
3d7790edf4 am 719df321: (-s ours) Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE.
# Via Jean-Baptiste Queru
* commit '719df3218b0e922935f2afa396596f6991b68139':
2013-02-04 17:00:31 -08:00
Ian Rogers
9e195d160f am 2f228c39: am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
# Via Android Git Automerger (2) and others
* commit '2f228c395133db6d18a5d11b6103ea0f962b15f1':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-04 11:29:34 -08:00
Jean-Baptiste Queru
724dd072e5 am 024f97c6: am 825f29b1: Merge from jb-mr1.1-dev
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit '024f97c67b179894d7333cd7c68d9787f2d9382f':
2013-02-04 11:29:23 -08:00
Devin Kim
fd398accb4 am 2b0c471c: am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '2b0c471ce07b57449762cbfd4303a0855c022e45':
  charger: Do not suspend when disconnecting from charger
2013-02-04 11:29:19 -08:00
choongryeol.lee
e2a12435c6 am 566cd8d1: am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Android Git Automerger (3) and Iliyan Malchev (1)
* commit '566cd8d165c25be55779d992c784890f51dce3b6':
  charger: suspend enable in charger mode
2013-02-04 11:29:19 -08:00
Ed Heyl
5a0249e549 am 823ce038: (-s ours) am 2507aed4: reset to 016806a7, but keep bad history for fast forward
# By Iliyan Malchev
# Via Android Git Automerger (3) and others
* commit '823ce03898c92336fe67276fe5e679ef382dfce0':
  libsuspend: compile as a static library
2013-02-04 11:29:18 -08:00
Jean-Baptiste Queru
719df3218b Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE. 2013-02-04 11:22:26 -08:00
Nick Kralevich
21291f1ac5 Revert "property_get: do argument checking."
This reverts commit 75cc88546b.
2013-02-04 09:49:13 -08:00
Nick Kralevich
91e63efeef Revert "Fix win_sdk build."
This reverts commit 941daef629.

Change-Id: I6b509492964baf535e0eeb1a731bf70c91715942
2013-02-04 09:48:54 -08:00
The Android Automerger
bc66653e32 merge in jb-mr2-release history after reset to master 2013-02-04 07:11:29 -08:00
Nick Kralevich
941daef629 Fix win_sdk build.
Don't depend on sys/cdefs.h, which doesn't exist when building
for the host.Don't try to compile property_len() checking code
in mingw32, it doesn't work.

Change-Id: I6a56b759bd4e8d30d6ca136e43d6515bf7408cc6
2013-02-02 17:26:38 -08:00
Ian Rogers
2f228c3951 am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
# Via Android Git Automerger (1) and others
* commit '271d6dfb9cfd3fee321ae14d43b067c97aa3a846':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:44:32 -08:00
Benoit Goby
045a4a9c3a adb: Fix secure adb when booting with usb attached
When booting with usb attached, the secure adb authentication happens
long before the framework is done booting, so adb can't notify the
framework to install the public key.

Change-Id: Id2af6cebece345022f56cb0c4b5af24e1d7a425c
2013-02-02 01:19:06 +00:00
Ian Rogers
271d6dfb9c am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
# Via Gerrit Code Review (1) and Ian Rogers (1)
* commit '78432ab1f42d59fed474365b95b7501dcccacebf':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:11:02 -08:00
Ian Rogers
78432ab1f4 Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants." 2013-02-02 00:06:12 +00:00
Jean-Baptiste Queru
024f97c67b am 825f29b1: Merge from jb-mr1.1-dev
# Via Jean-Baptiste Queru
* commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':
2013-02-01 15:41:57 -08:00
Jean-Baptiste Queru
825f29b1c8 Merge from jb-mr1.1-dev 2013-02-01 15:37:53 -08:00
Colin Cross
544d196e22 am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."
# By Stephen Smalley
# Via Android Git Automerger (1) and others
* commit '7480c0079d8c7fcfd5b3d9decfdabfebde162781':
  Label sockets consistently with the seclabel value if specified.
2013-02-01 15:28:52 -08:00
Nick Kralevich
cc62beebff Merge "property_get: do argument checking." 2013-02-01 23:18:39 +00:00
Devin Kim
2b0c471ce0 am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '693a3d6cd9658909f785d6dd179ba226fefec4a4':
  charger: Do not suspend when disconnecting from charger
2013-02-01 13:35:41 -08:00
choongryeol.lee
566cd8d165 am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '83d16c9e47236aabac3cae05bde96c6fa2089cf8':
  charger: suspend enable in charger mode
2013-02-01 13:35:40 -08:00
Ed Heyl
823ce03898 am 2507aed4: reset to 016806a7, but keep bad history for fast forward
# By Rom Lemarchand (11) and others
# Via Android Git Automerger (194) and others
* commit '2507aed4300ffddfe0bd22843093ce66cf0a7b52': (48 commits)
  cutils: remove dead code.
  logwrap: add quiet flag to logwrap()
  logwrap: Replace sigprocmask with pthread_sigmask
  logwrap: wait for child process when receiving SIGINT or SIGQUIT
  logwrap: ensure child exits with _exit
  Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
  logwrap: remove unnecessary call to setuid/setgid
  logwrap: fix off by 1 argument error
  logwrapper: switch to signal handlers for SIGCHLD
  property_service: make /dev/__properties__ readable
  toolbox: renice: Add -t TYPE parameter and switch to getopt
  libsuspend: compile as a static library
  Revert "init: make system properties more secure."
  init: make system properties more secure.
  Revert "init.usb.rc: set sys.usb.config to none before changing it"
  adb: Add "unauthorized" connection state
  adb: Read secure adb keys on every auth request
  logwrapper: prevent logwrap from hanging when child dies
  logwrapper: split into liblogwrap and the executable itself
  cutils: add simple reference counter
  ...
2013-02-01 13:35:40 -08:00
Colin Cross
7480c0079d am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."
# By Stephen Smalley
# Via Gerrit Code Review (1) and Stephen Smalley (1)
* commit 'b2639f4015c9fb2ff10c7bfae6074a8d968f5b7e':
  Label sockets consistently with the seclabel value if specified.
2013-02-01 11:31:14 -08:00
Ian Rogers
80c3b278fd Inline ldrex/strex for thumb2, remove ARMv5 remnants.
We assume ARMv7 which with thumb2 has ldrex/strex operations that may be
inlined if -mthumb is defined.
Remove remnants of ARMv5 support.

Change-Id: I9bb9525ae6ff4816ba391115019d841f63c12348
2013-02-01 11:30:31 -08:00
Colin Cross
b2639f4015 Merge "Label sockets consistently with the seclabel value if specified." 2013-02-01 19:04:56 +00:00
Devin Kim
693a3d6cd9 am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '6a7a324502e34e10830806751efbc514014815ee':
  charger: Do not suspend when disconnecting from charger
2013-02-01 10:58:06 -08:00
choongryeol.lee
83d16c9e47 am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '9190c0b3fdfdbcee98367c767dae0bd45f6ab08a':
  charger: suspend enable in charger mode
2013-02-01 10:58:05 -08:00
Devin Kim
6a7a324502 am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Iliyan Malchev
* commit 'cf5c32c26c3b458cd9f8d8f7ba07f1fbb8b496e5':
  charger: Do not suspend when disconnecting from charger
2013-02-01 10:55:57 -08:00
choongryeol.lee
9190c0b3fd am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Iliyan Malchev
* commit 'dec27f6e11c2bdfe35791d0d25a3b1bb2204d194':
  charger: suspend enable in charger mode
2013-02-01 10:55:56 -08:00
The Android Automerger
874f054b66 merge in jb-mr2-release history after reset to master 2013-02-01 07:10:55 -08:00
Nick Kralevich
75cc88546b property_get: do argument checking.
Try to verify, at compile time, that the supplied
value buffer is large enough.

There's more we can do here, but this is a good first
pass.

Change-Id: Iac8153826c89114b2755735032423c6744f7a61b
2013-01-31 15:20:14 -08:00
Ed Heyl
2507aed430 reset to 016806a7, but keep bad history for fast forward 2013-01-31 14:54:25 -08:00
Eric Laurent
ef89911ed6 Merge "audio: added input device for front + back mic" 2013-01-31 22:32:34 +00:00
The Android Automerger
7601b426e8 merge in jb-mr2-release history after reset to master 2013-01-31 07:11:04 -08:00
Iliyan Malchev
749debe0ff am 085943a1: am fdf2f337: libsuspend: compile as a static library
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '085943a16cb3fdce91ff7345928afb1b259e2060':
  libsuspend: compile as a static library
2013-01-30 13:39:20 -08:00