summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8ae80a68: am 249b16d9: Merge "init: Set perms for cpufreq interactive ↵Todd Poynor2012-04-301-0/+2
|\ | | | | | | | | | | | | governor input boost sysfs" into jb-dev * commit '8ae80a68f3ba0587a45e73504498a1cf57f0d5ad': init: Set perms for cpufreq interactive governor input boost sysfs
| * am 249b16d9: Merge "init: Set perms for cpufreq interactive governor input ↵Todd Poynor2012-04-301-0/+2
| |\ | | | | | | | | | | | | | | | | | | boost sysfs" into jb-dev * commit '249b16d9b52cd9242306290aa690adfece33b4d5': init: Set perms for cpufreq interactive governor input boost sysfs
| | * Merge "init: Set perms for cpufreq interactive governor input boost sysfs" ↵Todd Poynor2012-04-301-0/+2
| | |\ | | | | | | | | | | | | into jb-dev
| | | * init: Set perms for cpufreq interactive governor input boost sysfsTodd Poynor2012-04-271-0/+2
| | | | | | | | | | | | | | | | Change-Id: Ie475c95d81635a068db11e7018895024247878b4
* | | | am d5fc797f: am f1f0d224: am 331667ff: Use #define value of 1 to indicate ↵Jeff Brown2012-04-280-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | presence of headers. * commit 'd5fc797fddcbde6574273c0e33d3a569dc6ef415': Use #define value of 1 to indicate presence of headers.
| * | | am f1f0d224: am 331667ff: Use #define value of 1 to indicate presence of ↵Jeff Brown2012-04-280-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers. * commit 'f1f0d224c6d4c116eef8ae821e42370ad0fad957': Use #define value of 1 to indicate presence of headers.
| | * \ \ am 331667ff: Use #define value of 1 to indicate presence of headers.Jeff Brown2012-04-284-8/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '331667ffc86cd907cb80a708db5b7a8a84100217': Use #define value of 1 to indicate presence of headers.
| | | * | | Use #define value of 1 to indicate presence of headers.Jeff Brown2012-04-284-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using Change-Id: If899845503547410cf17d005733d1c0c6741e939
* | | | | | am 9a676caa: am ced29ec3: am 87576b5f: Merge "Restrict zygote to system user."Colin Cross2012-04-270-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9a676caaa715cc3d56b884382cf2c49c5f4c1e28': Restrict zygote to system user.
| * | | | | am ced29ec3: am 87576b5f: Merge "Restrict zygote to system user."Colin Cross2012-04-270-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'ced29ec3afda61735b513ede449987c3af3daa63': Restrict zygote to system user.
| | * | | | am 87576b5f: Merge "Restrict zygote to system user."Colin Cross2012-04-271-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '87576b5febf3a46490a8ec355e5e920a5123fac0': Restrict zygote to system user.
| | | * | | Merge "Restrict zygote to system user."Colin Cross2012-04-271-1/+1
| | | |\ \ \
| | | | * | | Restrict zygote to system user.Nick Kralevich2012-04-271-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVE-2011-3918: Address denial of service attack against Android's zygote process. This change enforces that only UID=system can directly connect to zygote to spawn processes. Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
* | | | | | am d0ffe384: am ce182cb8: Merge "Let users with SYSTEM permission set debug. ↵Romain Guy2012-04-271-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties" into jb-dev * commit 'd0ffe3840bbcf95e1ee79a4a6926d04c2ea1d56b': Let users with SYSTEM permission set debug. properties
| * | | | | am ce182cb8: Merge "Let users with SYSTEM permission set debug. properties" ↵Romain Guy2012-04-271-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'ce182cb8c00d0f5dedadbd4964dbc8cb705b8550': Let users with SYSTEM permission set debug. properties
| | * | | | Merge "Let users with SYSTEM permission set debug. properties" into jb-devRomain Guy2012-04-271-0/+1
| | |\ \ \ \
| | | * | | | Let users with SYSTEM permission set debug. propertiesRomain Guy2012-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieda3f7dd5dca5f6a8fc50b07822e6a875db030ad
* | | | | | | am efc70215: am bb2cba56: Merge "Add encryption parameters to adb install" ↵Kenny Root2012-04-271-2/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'efc702154b5b8256149d1a7a76487244b0d537f8': Add encryption parameters to adb install
| * | | | | | am bb2cba56: Merge "Add encryption parameters to adb install" into jb-devKenny Root2012-04-271-2/+14
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bb2cba56b9b64f8bc5ed2bfb68e4836d22862200': Add encryption parameters to adb install
| | * | | | | Merge "Add encryption parameters to adb install" into jb-devKenny Root2012-04-271-2/+14
| | |\ \ \ \ \
| | | * | | | | Add encryption parameters to adb installAnonymous Coward2012-04-271-2/+14
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Change-Id: I92e5f6ace1bc9e711c14cb83533aeb99ab9ab9f7
* | | | | | | am 03768b36: am b982bce7: Revert "libsysutils: NetlinkEvent: add support for ↵JP Abgrall2012-04-272-15/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface xt_IDLETIMER events." * commit '03768b363cdfbc976ab92a07d70e46b8cd597276': Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."
| * | | | | | am b982bce7: Revert "libsysutils: NetlinkEvent: add support for interface ↵JP Abgrall2012-04-272-15/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xt_IDLETIMER events." * commit 'b982bce73b7e2c824ffb50115ea382fe45c751a4': Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."
| | * | | | | Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER ↵JP Abgrall2012-04-262-15/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events." This reverts commit 731d831e91d5d9f8b15ca95367977abe35967166. Now that the xt_IDLETIMER uses the KOBJECT_UEVENT netlink, this change is not needed anymore.
* | | | | | am cf417693: am 64753635: am a02ff986: Merge "init: Add noexec mount option"Colin Cross2012-04-271-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cf41769375f34dbf17de52df02e4881ecfee0c8b': init: Add noexec mount option
| * | | | | am 64753635: am a02ff986: Merge "init: Add noexec mount option"Colin Cross2012-04-271-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '647536359f8ea63330805cb77abbf2f101952daa': init: Add noexec mount option
| | * | | | am a02ff986: Merge "init: Add noexec mount option"Colin Cross2012-04-271-0/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'a02ff986fc0fe5543bb2168814eee04eac8ef579': init: Add noexec mount option
| | | * | | Merge "init: Add noexec mount option"Colin Cross2012-04-261-0/+1
| | | |\ \ \
| | | | * | | init: Add noexec mount optionLars Svensson2012-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic13d66797a86d38432e79af0c3387ce986d0a19f
* | | | | | | am e860d239: am 9c1c2059: am 5b3eb07e: Merge "Prevent bit shifting if num ↵Colin Cross2012-04-261-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bits is negative" * commit 'e860d239529a484021d779d391c823ca93323ae1': Prevent bit shifting if num bits is negative
| * | | | | | am 9c1c2059: am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"Colin Cross2012-04-261-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9c1c205931311d576442b5025391d851b22afccb': Prevent bit shifting if num bits is negative
| | * | | | | am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"Colin Cross2012-04-261-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '5b3eb07ed730f9765c93afcb7f49559c212fe533': Prevent bit shifting if num bits is negative
| | | * | | | Merge "Prevent bit shifting if num bits is negative"Colin Cross2012-04-261-1/+2
| | | |\ \ \ \
| | | | * | | | Prevent bit shifting if num bits is negativeBhanu Chetlapalli2012-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes OpenGL Software Renderer to generate incorrect window coordinates on MIPS & possibly x86 Change-Id: I3c51b6a5a4e6af75e9b31d9d47e4e4d894825888 Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
* | | | | | | | am 1875930a: (-s ours) am 8d3ea1d1: init: set perms for cpufreq interactive ↵Todd Poynor2012-04-250-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | governor boost -- DO NOT MERGE * commit '1875930a9d24f2b97650bf511c52d197ba0d44d6': init: set perms for cpufreq interactive governor boost -- DO NOT MERGE
| * | | | | | | am 8d3ea1d1: init: set perms for cpufreq interactive governor boost -- DO ↵Todd Poynor2012-04-251-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit '8d3ea1d1e198e71ca3f856c6f397faf40922f562': init: set perms for cpufreq interactive governor boost -- DO NOT MERGE
| | * | | | | | init: set perms for cpufreq interactive governor boost -- DO NOT MERGETodd Poynor2012-04-251-0/+2
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6509cda358b4a75706afd01a5b5a36eabe492554 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | | | | am d8b46e7f: am f8bbaba5: Add directory for forward locked apps in ASECsKenny Root2012-04-251-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd8b46e7fd6769bcae2cdd763a809a265e7a527da': Add directory for forward locked apps in ASECs
| * | | | | | am f8bbaba5: Add directory for forward locked apps in ASECsKenny Root2012-04-251-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f8bbaba57bf309fec83dc9842176d996831e6db1': Add directory for forward locked apps in ASECs
| | * | | | | Add directory for forward locked apps in ASECsKenny Root2012-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward locked apps on internal storage will be stored in ASEC containers using ext4. This way permissions can be preserved whether on internal or external storage. Change-Id: I942f8f0743c210330a11e2b1d0204df7a5ddb2ae
* | | | | | | am 75878ecc: Merge from AOSPJean-Baptiste Queru2012-04-250-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '75878eccc219c02eff6363f1b16a8dab07032322': Forward compatibility
| * | | | | | Merge from AOSPJean-Baptiste Queru2012-04-250-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / Change-Id: Iae692bc1c54ffc241fd6853bbbdab19688c4f46b
| | * | | | am 307d9cfc: Merge from AOSPJean-Baptiste Queru2012-04-240-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | * commit '307d9cfc1690ec4982152aae1b6bd24ff8e078ed':
| | | * | | Merge from AOSPJean-Baptiste Queru2012-04-241-0/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
| | * | \ \ \ am 980a59b4: Forward compatibilityJean-Baptiste Queru2012-04-241-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | * commit '980a59b45dd210d2c2d0d9e61d48899af2d1099f': Forward compatibility
| | | * | | Forward compatibilityJean-Baptiste Queru2012-04-241-1/+2
| | | | |/ | | | |/| | | | | | | | | | | Change-Id: I51a5eb98fb3fa3e09f2eb75de128068572081046
* | | | | init: set perms for cpufreq interactive governor boostTodd Poynor2012-04-251-0/+2
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I6509cda358b4a75706afd01a5b5a36eabe492554 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Merge "ANativeWindow: add set_active_rect"Mathias Agopian2012-04-241-4/+33
|\ \ \ \
| * | | | ANativeWindow: add set_active_rectJamie Gennis2012-04-171-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the set_active_rect 'method' to the ANativeWindow interface. Change-Id: Iae910d259ba5c3e94594fa1ffec5fc0662546ad0
* | | | | add query for finding out if consumer runs behind of producerJamie Gennis2012-04-241-1/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I3baae99d4da00d962d3afe6bdfc16e3eb04ede24