Commit Graph

42705 Commits

Author SHA1 Message Date
Brian Colonna
1f3c500feb am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
  DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:37:14 -08:00
Brian Colonna
4396642bd5 am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
  DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:35:27 -08:00
Brian Colonna
41e7472dad Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 2012-01-12 06:33:49 -08:00
satok
b37021a362 Merge "Make public SpellChecker utilities" 2012-01-11 21:14:23 -08:00
Irfan Sheriff
94390d6942 Merge "Sync up state with supplicant at start" 2012-01-11 20:33:11 -08:00
Xia Wang
1556662f95 am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:57:16 -08:00
Xia Wang
0b22ec88d3 am b18a7c3e: am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit 'b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
  Get average value for image processing test bug#: 5566079
2012-01-11 17:57:14 -08:00
Xia Wang
61f0dd8594 am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:53:38 -08:00
Xia Wang
ed46c6fc28 am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
  Get average value for image processing test bug#: 5566079
2012-01-11 17:53:36 -08:00
Xia Wang
50bf48027e Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 2012-01-11 17:52:06 -08:00
Xia Wang
db412c81a9 Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 2012-01-11 17:51:48 -08:00
Katie McCormick
de67dfee13 am 3808f8cc: am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '3808f8ccec18f7b04ef983d553fb10f3e2983216':
  Doc change: Adding Bluetooth HDP info.
2012-01-11 16:45:00 -08:00
Katie McCormick
f205ee30f3 am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
  Doc change: Adding Bluetooth HDP info.
2012-01-11 16:42:29 -08:00
Katie McCormick
698d442697 Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 2012-01-11 16:40:37 -08:00
John Reck
573c2cae96 Merge "Initial NavCache removal support" 2012-01-11 16:34:26 -08:00
John Wang
3ce55ee868 am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '70205788fa39968b8331085597e3d3b61e271fbe':
  Adjust the mapping of LTE signal bars.
2012-01-11 16:05:14 -08:00
Selim Gurun
6eaf101cf4 am 0265a4a0: (-s ours) am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '0265a4a0e02db98b85bd7f9be8b866d3fb9889d2':
  Do Not Merge. Move ssl callbacks to webcore thread.
2012-01-11 16:04:55 -08:00
John Wang
6f6f4eed96 am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
  Adjust the mapping of LTE signal bars.
2012-01-11 15:36:00 -08:00
Selim Gurun
e835c3a6fe am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
  Do Not Merge. Move ssl callbacks to webcore thread.
2012-01-11 14:20:32 -08:00
Selim Gurun
d99d96e3dc Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 2012-01-11 14:18:14 -08:00
Glenn Kasten
19f2cfe3ad Merge "Fix build warnings" 2012-01-11 13:42:47 -08:00
Glenn Kasten
772b29ff49 Merge "Fix race in AudioSystem::getInputBufferSize" 2012-01-11 11:40:27 -08:00
Glenn Kasten
a9c933d3c7 Merge "Fix bug in JetPlayer::loadFromFile" 2012-01-11 11:39:06 -08:00
Glenn Kasten
a8d1a31585 Merge "Simplify range check for audio_mode_t" 2012-01-11 11:38:21 -08:00
Glenn Kasten
21777444e6 Merge "Fix build warnings" 2012-01-11 11:37:53 -08:00
Eric Laurent
a2e048e14a am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
  stagefright: limit audio gap for looped playback
2012-01-11 11:14:30 -08:00
Eric Laurent
a63db7800e am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
2012-01-11 11:12:45 -08:00
Eric Laurent
85ed73d287 Merge "stagefright: limit audio gap for looped playback" into ics-mr1 2012-01-11 11:10:38 -08:00
Teng-Hui Zhu
a753afa801 Merge "Query the native side to decide to play when going into full screen mode" 2012-01-11 10:31:24 -08:00
Glenn Kasten
6208c19c33 Merge "Use correct type for hardware call state" 2012-01-11 10:25:23 -08:00
Glenn Kasten
7c12106db8 Merge "Declare IAudioTrack methods in binder opcode order" 2012-01-11 10:23:34 -08:00
Glenn Kasten
3c4fac9c59 Merge "Use consistent style of & reference for AutoMutex" 2012-01-11 10:23:04 -08:00
Glenn Kasten
c1cb740868 Merge "Fix missing tag in mediaserver ServiceManager: log" 2012-01-11 10:22:45 -08:00
Glenn Kasten
d72dbd8002 Merge "AudioFlinger new can't fail" 2012-01-11 10:22:19 -08:00
Glenn Kasten
7e8c52d693 Merge "Fix build warning" 2012-01-11 10:01:34 -08:00
Narayan Kamath
5873400ac8 Merge "Write unit tests for android.speech.tts." 2012-01-11 03:39:57 -08:00
Steve Block
eea80b9330 Merge "Remove some stale TODOs from the Java Bridge tests" 2012-01-11 03:14:29 -08:00
satok
e7227cc9be Merge "Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard Bug: 5806103" 2012-01-11 01:52:50 -08:00
Roman Nurik
80136b5a58 am 4ada9c6f: am c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit '4ada9c6f3e8911d837820c483b588b430b06e6d3':
  Prevent Android Design sidenav links from opening a new window
2012-01-11 00:24:36 -08:00
Roman Nurik
b7de5dd80b am c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
  Prevent Android Design sidenav links from opening a new window
2012-01-11 00:21:41 -08:00
Scott Main
4a47cd21d3 am 25b772f3: am acd152f0: docs: editorial fix to homepage
* commit '25b772f357d79ddf39c69541839465a9fd2cbf39':
  docs: editorial fix to homepage
2012-01-10 21:16:08 -08:00
Scott Main
d8ec891580 am acd152f0: docs: editorial fix to homepage
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
2012-01-10 21:13:38 -08:00
Jeff Sharkey
f0c7552b4b Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Scott Main
bbeee598b2 am 7cffe2c6: am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '7cffe2c66815fcd2c5dc4579ed964901bc17b431':
  docs: add links to Android Design from dev docs
2012-01-10 17:12:25 -08:00
Scott Main
65aba416a7 am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
  docs: add links to Android Design from dev docs
2012-01-10 17:10:28 -08:00
Scott Main
93e7348d94 Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00
Roman Nurik
3726ce85af am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design
2012-01-10 17:06:59 -08:00
Roman Nurik
28288d6535 am 548972d7: Merge "Android Design" into ics-mr1
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
2012-01-10 17:04:05 -08:00
Roman Nurik
0dc1f704b2 Merge "Android Design" into ics-mr1 2012-01-10 17:01:45 -08:00
Ying Wang
ae36d6f15b Merge "Build all test apks as raw resource in FrameworksCoreTests." 2012-01-10 16:37:43 -08:00