ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4267 commits 1 branch 0 tags 217 MiB
Commit graph

4267 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
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
Elliott Hughes
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
Elliott Hughes
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
Elliott Hughes
50e2555d6c Merge "Always include <sys/socket.h> before <linux/netlink.h>." 2012-09-12 10:25:15 -07:00
Elliott Hughes
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
Kenny Root
0f5e303c6a Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev 2012-09-10 17:05:23 -07:00
Colin Cross
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
Colin Cross
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
Colin Cross
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
Colin Cross
922b460cc7 Merge "fastboot: move help command before usb connect" 2012-09-10 14:13:29 -07:00
Colin Cross
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
Colin Cross
ae807aaa02 Merge "fastboot: move help command before usb connect" into jb-mr1-dev 2012-09-10 14:11:44 -07:00
Kenny Root
5054417c10 Add /data/app-lib for native library sharing 
Change-Id: I7419676d987178fd2422c50d74f966e27af9f62e
 2012-09-08 22:39:44 -07:00
Ian Rogers
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
Ian Rogers
6de267876b am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma." 
* commit '0991797fd6cabc582afb0a35a62ad0cdc9cd6837':
  Remove unnecessary compiler pragma.
 2012-09-07 20:00:29 -07:00
Ian Rogers
0991797fd6 am 82959f5e: Merge "Remove unnecessary compiler pragma." 
* commit '82959f5e46870cb57675d1ebba97294c56508949':
  Remove unnecessary compiler pragma.
 2012-09-07 19:59:33 -07:00
Ian Rogers
82959f5e46 Merge "Remove unnecessary compiler pragma." 2012-09-07 19:28:54 -07:00
Eric Laurent
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
Jean-Michel Trivi
38f10f8649 Merge "Device and mode definitions for remote submix" into jb-mr1-dev 2012-09-07 10:01:16 -07:00
Jean-Michel Trivi
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
Jeff Sharkey
d2f9bf3add Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev 2012-09-06 14:51:59 -07:00
Jeff Sharkey
58d3980f31 Keep /mnt/secure private to default namespace. 
When vold mounts things in /mnt/secure/staging, it expects to MS_MOVE
those mountpoints when vetting is finished.  However, the kernel
doesn't allow MS_MOVE when the source is shared to child namespaces.

To work around this, create a tmpfs at /mnt/secure and mark it as
private (not shared).  Verified that vold can now successfully move
from the staging area.

Bug: 7094858
Change-Id: I5e05b1005c63efa277935c9bbd18cbf3ffdd47a3
 2012-09-06 14:15:46 -07:00
Jeff Sharkey
d8a8979bd9 Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev 2012-09-06 13:08:37 -07:00
Jeff Sharkey
d6d4286a28 Bring back ADB_EXTERNAL_STORAGE. 
Bug: 7119408
Change-Id: Ic9a23fb6adfb1db771e1e278179586bca69a5edd
 2012-09-06 13:05:40 -07:00
The Android Open Source Project
83e3842f4e am 7908a68e: (-s ours) Reconcile with jb-release - do not merge 
* commit '7908a68e7041459c383513a67fbda8da1bba3177':
 2012-09-06 08:31:24 -07:00
The Android Open Source Project
7908a68e70 Reconcile with jb-release - do not merge 
Change-Id: I74a36d0a79723c656b50f36c1d96042e50a0c943
 2012-09-06 08:09:33 -07:00
Ying Wang
96535ba620 Dist fastboot and adb for the sdk build. 
So they can be downloaded from the build page.
Bug: 7109694

Change-Id: Ibc60d0acbc5d2445c01010fd0bd4654a240b0a88
 2012-09-05 10:26:43 -07:00
Benoit Goby
345ca131bb adb: Link statically with libcrypto 
Bug: 7063951
Change-Id: I328b76a751aceaae625d64156f22ce3de65678c8
 2012-08-31 18:24:07 -07:00
Benoit Goby
59680145c8 Merge "adb: Create private key with 0600 mode" into jb-mr1-dev 2012-08-31 14:40:51 -07:00
Benoit Goby
64b3103017 adb: Create private key with 0600 mode 
Changed key name to force generating new pairs.

Bug: 7092477
Change-Id: I680cb9dd1896ae52b2b29d63533f966e033d823f
 2012-08-31 12:31:36 -07:00
Jeff Sharkey
9685194fc9 File-system utilities for installd and zygote. 
Bug: 7008879
Change-Id: Ia54b8d4ad434e8973f235e2a4728651814bef8a9
 2012-08-30 10:29:41 -07:00
Colin Cross
c7b75dcc1a 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-08-29 18:21:06 -07:00
Ian Rogers
04b5ac36a5 Remove unnecessary compiler pragma. 
With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Also fix compiler warning about redefinition of LOG_TAG.

Depends upon: https://android-review.googlesource.com/42351

Change-Id: I50f70be31f4bd994b09083e722759464476c70b3
 2012-08-29 18:13:14 -07:00
The Android Automerger
c4e7e976ff merge in jb-release history after reset to jb-dev 2012-08-29 14:29:55 -07:00
The Android Automerger
98a7c86bb0 merge in jb-release history after reset to jb-dev 2012-08-29 12:43:13 -07:00
Ian Rogers
84ac402fa1 Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev 2012-08-29 08:54:04 -07:00
Wink Saville
5c9da7b65c am e3524293: am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils" 
* commit 'e3524293da5d7503dddb00911b9e5b37e9417981':
  Export flags needed for ifc_reset_connections API in netutils
 2012-08-28 19:54:59 -07:00
Wink Saville
e3524293da am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils" 
* commit 'af03b05009863f5d9761864dcec13e4ee6221d69':
  Export flags needed for ifc_reset_connections API in netutils
 2012-08-28 19:50:20 -07:00
Wink Saville
af03b05009 Merge "Export flags needed for ifc_reset_connections API in netutils" 2012-08-28 19:43:27 -07:00
Ian Rogers
fd7f1b6a50 Revert "Revert "Upgrade to dlmalloc 2.8.5."" 
This reverts commit 42b83c6df7.
 2012-08-28 15:52:20 -07:00
Mike Lockwood
59c778e988 Merge "import init.${ro.hardware}.rc last to allow overriding default USB configuration" into jb-mr1-dev 2012-08-28 10:40:44 -07:00
Mike Lockwood
35ea5e4f23 import init.${ro.hardware}.rc last to allow overriding default USB configuration 
Change-Id: I2194466fb7cf7ff5313d146601155ebe6043fd42
 2012-08-28 10:25:13 -07:00
Jean-Baptiste Queru
8bbc8a2884 am 7995b841: am c3c5358b: Merge "Add MIPS support to pixelflinger." 
* commit '7995b841483fc45cc762d7dab8a8817a6d97492b':
  Add MIPS support to pixelflinger.
 2012-08-27 15:19:07 -07:00
Jean-Baptiste Queru
7995b84148 am c3c5358b: Merge "Add MIPS support to pixelflinger." 
* commit 'c3c5358b94f48799fd595c829ce223b43588bac1':
  Add MIPS support to pixelflinger.
 2012-08-27 15:15:24 -07:00
Jean-Baptiste Queru
c3c5358b94 Merge "Add MIPS support to pixelflinger." 2012-08-27 14:22:22 -07:00
Jamie Gennis
d7c8fe6abb Merge "Add an IMPL_DEFINED pixel format." into jb-mr1-dev 2012-08-24 11:11:32 -07:00
Stephen Hines
1182e61f76 Merge "Link directly with libm due to libpng dependency." into jb-mr1-dev 2012-08-23 17:50:15 -07:00
Stephen Hines
c60e6e7e58 Link directly with libm due to libpng dependency. 
Change-Id: I9a9b8c3db025b8391b6a0e96ca24ed9cda3ab9a2
 2012-08-23 15:17:09 -07:00
Wink Saville
f824ad7b35 am 582b1152: am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO" 
* commit '582b11527cd6d968f163fbee73f92d82b679e330':
  Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
 2012-08-23 14:11:35 -07:00
Jean-Baptiste Queru
2bf953a9ba Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev 2012-08-23 12:26:15 -07:00