c17f18612b
am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
...
* commit '7e014ce6defdfe596d83ff549a13f7215151069e':
Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:10:11 -07:00
7e014ce6de
am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
...
* commit 'cdc4a400b3a47564887ac1220bfb7f6f8312a71e':
Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:08:42 -07:00
cdc4a400b3
am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
...
* commit 'cb71ed3092cef3b1c56d8d873788daea82de7879':
Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:06:49 -07:00
cb71ed3092
am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
...
* commit '50e2555d6c824bd3c7e664f222061158a83ac705':
Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:04:47 -07:00
50e2555d6c
Merge "Always include <sys/socket.h> before <linux/netlink.h>."
2012-09-12 10:25:15 -07:00
b77d3d7249
Always include <sys/socket.h> before <linux/netlink.h>.
...
Newer kernel headers files aren't stand alone. (This has long been true of
glibc's copy, but we only recently updated external/kernel-headers.)
Change-Id: Iebcb40902b2f29fe509e207e2f3a9d02a7e40602
2012-09-12 10:10:20 -07:00
295b82bd69
Rename getline to fs_getline for fs_mgr
...
fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.
Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.
This is needed it we want to add getline in bionic.
Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-12 19:48:51 +03:00
b6f137c7d8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3935a689501afea5ad92ff559aa433b03d78bd65
2012-09-12 07:41:57 -07:00
d832567908
Add event log tag for cert pin failures.
...
Change-Id: Ib93f4eeec35b5754498464ada94faeb2bdb0b896
2012-09-11 21:38:31 -07:00
d03072ffde
The localtime_tz and mktime_tz extensions are now in bionic.
...
Bug: 7012465
Change-Id: I5f3d06fe06fad7c3ff6d1950770a30f4f83e56ff
2012-09-11 11:18:38 -07:00
a95c0fa986
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 07:00:15 -07:00
2a048fe827
am 12dc7c8e: am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
...
* commit '12dc7c8e4ba43d6dbca28ccb78de40a816ca162f':
Add /data/app-lib for native library sharing
2012-09-10 17:25:01 -07:00
c2cb108647
am 8ada7b0e: am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit '8ada7b0e6a023e036de20158b293e2c301602433':
fastboot: move help command before usb connect
2012-09-10 17:16:11 -07:00
910bbfa9b7
am 85605900: am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev
...
* commit '856059003bde3b235ea907c66cc1742e665ae4a2':
fastboot: move help command before usb connect
2012-09-10 17:15:53 -07:00
011cae80f5
am 1fe8e62c: am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '1fe8e62ca20fccc0aabd7e39bc34d399bc499ef9':
Remove unnecessary compiler pragma.
2012-09-10 17:09:56 -07:00
53c8e8accc
am 9f02737d: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9f02737df73cc773e5b1cf62939b2752a6eb9a19':
Bring back ADB_EXTERNAL_STORAGE.
2012-09-10 17:07:12 -07:00
72144278f3
am 6276069f: am eeeee802: audio: new audio devices enum values
...
* commit '6276069f396fb52fe9626a340f56b6e7513da5fc':
audio: new audio devices enum values
2012-09-10 17:06:55 -07:00
a668fceca4
am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
...
* commit '0f5e303c6a88c63fc5a4d325ab675af7ed57b777':
Add /data/app-lib for native library sharing
2012-09-10 17:06:21 -07:00
12dc7c8e4b
am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
...
* commit '0f5e303c6a88c63fc5a4d325ab675af7ed57b777':
Add /data/app-lib for native library sharing
2012-09-10 17:06:12 -07:00
0f5e303c6a
Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
2012-09-10 17:05:23 -07:00
bb0c72587c
am a86364e5: am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev
...
* commit 'a86364e503c3f353dafd7f6f902083fa70964663':
Device and mode definitions for remote submix
2012-09-10 17:04:43 -07:00
686a445f1e
am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit 'fb4a4c35856ce9c9c6199d26d27bcbc9451f365a':
fastboot: move help command before usb connect
2012-09-10 14:49:12 -07:00
8ada7b0e6a
am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit 'fb4a4c35856ce9c9c6199d26d27bcbc9451f365a':
fastboot: move help command before usb connect
2012-09-10 14:49:00 -07:00
fb4a4c3585
am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit 'e6b898106c7c6f42529db185481d1d4805e91aff':
fastboot: move help command before usb connect
2012-09-10 14:47:38 -07:00
e6b898106c
am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit 'eb7ee9c0c513160d8db5c76a82f56ed966ec41c0':
fastboot: move help command before usb connect
2012-09-10 14:45:43 -07:00
eb7ee9c0c5
am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit '922b460cc790722ffc303b200f02958e4066a2de':
fastboot: move help command before usb connect
2012-09-10 14:43:26 -07:00
922b460cc7
Merge "fastboot: move help command before usb connect"
2012-09-10 14:13:29 -07:00
856059003b
am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev
...
* commit 'ae807aaa022196b2f08f64f303b380c1903b77e0':
fastboot: move help command before usb connect
2012-09-10 14:13:07 -07:00
a65d62bce3
am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev
...
* commit 'ae807aaa022196b2f08f64f303b380c1903b77e0':
fastboot: move help command before usb connect
2012-09-10 14:12:43 -07:00
80f9867431
fastboot: move help command before usb connect
...
Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.
Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
2012-09-10 14:12:37 -07:00
ae807aaa02
Merge "fastboot: move help command before usb connect" into jb-mr1-dev
2012-09-10 14:11:44 -07:00
bf929a9853
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 07:01:47 -07:00
5054417c10
Add /data/app-lib for native library sharing
...
Change-Id: I7419676d987178fd2422c50d74f966e27af9f62e
2012-09-08 22:39:44 -07:00
33d1cc72d1
am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '64604840debad8f9f24c22b6b90fb572a5dc2d6b':
Remove unnecessary compiler pragma.
2012-09-07 20:38:01 -07:00
1fe8e62ca2
am 64604840: am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '64604840debad8f9f24c22b6b90fb572a5dc2d6b':
Remove unnecessary compiler pragma.
2012-09-07 20:37:50 -07:00
64604840de
am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '6de267876b9311d635b7fe4eec81a4a859ac1790':
Remove unnecessary compiler pragma.
2012-09-07 20:35:02 -07:00
6de267876b
am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '0991797fd6cabc582afb0a35a62ad0cdc9cd6837':
Remove unnecessary compiler pragma.
2012-09-07 20:00:29 -07:00
0991797fd6
am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '82959f5e46870cb57675d1ebba97294c56508949':
Remove unnecessary compiler pragma.
2012-09-07 19:59:33 -07:00
82959f5e46
Merge "Remove unnecessary compiler pragma."
2012-09-07 19:28:54 -07:00
e7a4cbc0e7
am eeeee802: audio: new audio devices enum values
...
* commit 'eeeee802e9837c592b0f0f9fd183bcaa9e77732e':
audio: new audio devices enum values
2012-09-07 16:43:07 -07:00
3bfb8ec6b3
am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev
...
* commit '38f10f8649940eda42b2336a4757a9dd07e721cf':
Device and mode definitions for remote submix
2012-09-07 16:41:18 -07:00
9f02737df7
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I77e76ba09125bdbd371933808a6399ab62372d8c
2012-09-07 15:04:07 -07:00
6276069f39
am eeeee802: audio: new audio devices enum values
...
* commit 'eeeee802e9837c592b0f0f9fd183bcaa9e77732e':
audio: new audio devices enum values
2012-09-07 14:53:45 -07:00
98159b6940
am d2f9bf3a: Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev
...
* commit 'd2f9bf3addaa586c0dbc303508caf02c66dc03b9':
Keep /mnt/secure private to default namespace.
2012-09-07 13:43:53 -07:00
b603314790
am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev
...
* commit 'd8a8979bd932a73378286ecea6a03c7fa8e1b2a6':
Bring back ADB_EXTERNAL_STORAGE.
2012-09-07 13:42:49 -07:00
6af812c174
am 83e3842f: (-s ours) am 7908a68e: (-s ours) Reconcile with jb-release - do not merge
...
* commit '83e3842f4efc2647752d85af81869034dda985f6':
2012-09-07 13:40:42 -07:00
eeeee802e9
audio: new audio devices enum values
...
Each audio device is identified by a bit in a 32 bit field with
16 bits for output devices and 16 bits for input devices.
The number of output devices is now exhausted.
In order to add new devices a new convention for audio device
identification is defined, allowing 31 different input and output
devices: Bit 31 of the bit field is reserved and when set indicates
an input device.
Also added new output device for wifi display and new input devices
for digital and analog docks, USB and wifi display send.
Change-Id: I849bec0b6d46e082e325a3f08890d313c8dc763b
2012-09-07 10:37:43 -07:00
a86364e503
am 38f10f86: Merge "Device and mode definitions for remote submix" into jb-mr1-dev
...
* commit '38f10f8649940eda42b2336a4757a9dd07e721cf':
Device and mode definitions for remote submix
2012-09-07 10:03:12 -07:00
38f10f8649
Merge "Device and mode definitions for remote submix" into jb-mr1-dev
2012-09-07 10:01:16 -07:00
e11866a879
Device and mode definitions for remote submix
...
A remote submix is an audio mix of audio streams that
are not going to be played directly through the platform mix,
but rather will be mixed together to be handled in a
different manner. This mix can be obtained by recording
it through the AUDIO_IN_REMOTE_SUBMIX and presenting it
remotely (as opposed to local playback == on the device
itself).
All changes marked "temporary" will be overriden by the
changes to update the audio device definitions for
the 2.0 API.
Change-Id: I9c6da607fc50b7b8545d189ac5b083107369cfb5
2012-09-06 15:08:17 -07:00
Elliott Hughes