Jeff Brown
c6d6863c9b
Merge "Fix getSwitchState according to device capabilities."
2011-08-10 13:42:03 -07:00
Jeff Brown
091c0f7ece
Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
2011-08-10 13:41:36 -07:00
Gloria Wang
0e3e14faf6
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
2011-08-04 14:20:53 -07:00
Xavier Ducrohet
a62b24752b
Merge "Insert a break wraparound."
2011-08-04 12:36:11 -07:00
Mike Lockwood
fca789ba5f
Merge "GPS Provider Service changes"
2011-08-04 07:39:03 -07:00
Jean-Baptiste Queru
8fdba3dd72
Merge "Fix a compiling error when trying to use setBufferCount"
2011-08-02 17:02:48 -07:00
Teng-Hui Zhu
697bce061c
Fix a compiling error when trying to use setBufferCount
...
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
2011-08-02 16:57:20 -07:00
Conley Owens
b1d918badd
Merge "Prevent NullPointerException cases while using SipService."
2011-08-02 13:08:14 -07:00
Jean-Baptiste Queru
ae182598a2
Merge "Stagefright: Return error if codec takes too long to return a buffer."
2011-08-01 13:43:07 -07:00
Derek Sollenberger
0ed90b7894
Merge "Adding an optional param to the SurfaceTexture constructor."
2011-07-29 09:43:13 -07:00
Derek Sollenberger
77c988cf4e
Adding an optional param to the SurfaceTexture constructor.
...
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
2011-07-29 11:06:24 -04:00
Michaël Burtin
5aa3d79025
Fix getSwitchState according to device capabilities.
...
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.
Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
2011-07-29 15:28:02 +02:00
Jeff Brown
70aee95a17
Support wrapping app processes to inject debug instrumentation.
...
Bug: 4437846
Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc
Merge "gps: Adding ip address for AGps"
2011-07-28 13:52:55 -07:00
Mike Lockwood
a9b8a0640e
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
2011-07-28 13:13:35 -07:00
Xavier Ducrohet
eff4cc7766
Merge "Remove Debug Code"
2011-07-27 18:26:01 -07:00
Xavier Ducrohet
060c1a8f1a
Merge "DO NOT MERGE. may fix build on some version of gcc"
2011-07-27 13:45:05 -07:00
Mathias Agopian
aa599086f8
DO NOT MERGE. may fix build on some version of gcc
...
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
2011-07-27 11:31:57 -07:00
Dianne Hackborn
461653aa73
am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:35:32 -07:00
Dianne Hackborn
6f4d39f2fe
am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:23:46 -07:00
Dianne Hackborn
cf9580023e
Merge "frameworks/base: Cap the number of toasts that a package can post."
2011-07-21 22:21:19 -07:00
Dianne Hackborn
ac95550024
Merge "frameworks/base: unlink death notifications of Vibrate requests"
2011-07-21 22:18:47 -07:00
Xavier Ducrohet
e4209768bd
am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-21 16:23:18 -07:00
Xavier Ducrohet
fe7fbed179
Merge "Layoutlib_create flag -p: don't change all accesses to public."
2011-07-21 16:17:03 -07:00
Kenny Root
2cc4e531f0
am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
Continue idmap generation even if name lookup fails.
2011-07-21 13:09:05 -07:00
Kenny Root
c0e7a06170
Merge "Continue idmap generation even if name lookup fails."
2011-07-21 13:05:03 -07:00
Robert Greenwalt
a446055906
am b9f87f19: Merge "First pass tying into per-interface DNS cache"
...
* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
2011-07-21 11:28:01 -07:00
Robert Greenwalt
813dac24e4
Merge "First pass tying into per-interface DNS cache"
2011-07-21 11:16:12 -07:00
Xavier Ducrohet
029c3152d1
am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
2011-07-20 18:49:46 -07:00
Xavier Ducrohet
dd6656872a
Merge "Fix to compile for windows"
2011-07-20 18:35:35 -07:00
Xavier Ducrohet
97aaf7cbb9
am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
...
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0d4b0738b5
Merge "Added Caching for PreProcessed PNGs"
2011-07-20 15:55:33 -07:00
Xavier Ducrohet
99f603397f
am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
...
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
Add generation of dependency file for .ap_ package
2011-07-20 15:23:55 -07:00
Xavier Ducrohet
6e068693b3
Merge "Add generation of dependency file for .ap_ package"
2011-07-20 15:08:23 -07:00
Xavier Ducrohet
dae75dd7d5
am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
...
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
Add dependency generation to Aapt for R.java
2011-07-19 10:10:17 -07:00
Xavier Ducrohet
e74c354c7e
am 42755155: Merge "Copy once-created R.java into library projects"
...
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
Copy once-created R.java into library projects
2011-07-19 10:10:15 -07:00
Xavier Ducrohet
166845ba93
Merge "Add dependency generation to Aapt for R.java"
2011-07-19 10:03:16 -07:00
Xavier Ducrohet
c6c26cd7ec
Merge "Copy once-created R.java into library projects"
2011-07-19 10:03:05 -07:00
Conley Owens
61d3cf3bfa
am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
...
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:52:26 -07:00
Conley Owens
0d0cbd3d03
Merge "stagefright aacenc: Mark codeWord as UWord16"
2011-07-18 16:49:43 -07:00
Deckard Autoverifier
07f2ce413a
am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
...
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
2011-07-18 15:38:30 -07:00
Deckard Autoverifier
b54c227775
am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
...
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:38:27 -07:00
Deckard Autoverifier
2be5cc29df
am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
...
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:38:25 -07:00
Deckard Autoverifier
c4bb45511c
am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
...
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:38:22 -07:00
Deckard Autoverifier
fde808cbb3
Merge "stagefright: Include stdlib.h for malloc/free"
2011-07-18 15:23:41 -07:00
Deckard Autoverifier
e51e21c863
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
2011-07-18 15:23:31 -07:00
Deckard Autoverifier
1ae41e21dc
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
2011-07-18 15:23:20 -07:00
Deckard Autoverifier
605aac1879
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
2011-07-18 15:23:09 -07:00
Conley Owens
4b1d4a7ac3
am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:42:42 -07:00
Conley Owens
9569289a8d
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
2011-07-18 12:37:16 -07:00