Jason Sams
e940cc1ea0
Merge "Cleanup rs.spec file and code generator."
2011-04-27 13:20:39 -07:00
Conley Owens
aff77c78f7
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
1a43e04fd7
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Conley Owens
61b1dd24a9
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
f0015cab94
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
a97b487178
am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
4dc780e366
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Gloria Wang
6a0b883359
am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:27:05 -07:00
Conley Owens
12d06f72eb
am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
Fix for startup NPE.
2011-04-27 12:24:58 -07:00
Gloria Wang
27030e51a0
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:24:42 -07:00
Conley Owens
3cf9899bfa
am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
Fix for startup NPE.
2011-04-27 12:21:50 -07:00
Conley Owens
100a051134
am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Gloria Wang
6f9bbdf31a
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:11:49 -07:00
Svetoslav Ganov
ae2359da06
Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered."
2011-04-27 12:11:01 -07:00
Conley Owens
ff13c6559c
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Alex Sakhartchouk
708f726ca0
Merge "Better workaround for the bitmap invalidation problem."
2011-04-27 12:08:59 -07:00
Conley Owens
9deec6fe2a
Merge "Fix for startup NPE."
2011-04-27 11:40:46 -07:00
Guang Zhu
ccf7f3ee86
Merge "Make DRT pull data over network"
2011-04-27 11:05:28 -07:00
John Reck
f1592e4422
Merge "Add support for force-enabling zoom"
2011-04-27 10:46:39 -07:00
Bjorn Bringert
5b1cdf4716
Merge "Expose TTS engine API"
2011-04-27 01:16:21 -07:00
Adam Powell
2cb34a41f1
Merge "Fix overlay action bar decor layout for lower context mode area."
2011-04-26 18:38:23 -07:00
Nick Pelly
a6bb1444ab
am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
Implement dead service recovery in NFC extras library.
2011-04-26 18:11:02 -07:00
Nick Pelly
e8e764a417
am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
Implement dead service recovery in NFC extras library.
2011-04-26 18:09:02 -07:00
Mathias Agopian
0ea7d61fa1
Merge "Report errors when eglCreateImageKHR fails"
2011-04-26 18:05:23 -07:00
Nick Pelly
4dd1b75e82
am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.
2011-04-26 18:04:02 -07:00
Jamie Gennis
7fcb077c55
libgui: enable tests in the 'tests' build.
...
This change makes the libgui makefile recurse into the tests directory
so that the tests get built by a top-level make when
TARGET_BUILD_VARIANT=tests.
Change-Id: I6f623cc4b86dfeb00b9d21823316dbd9def23110
2011-04-26 17:26:37 -07:00
Xia Wang
a88c78d995
Merge "- Add instrumentation utility to automate rs performance tests: The RsBench test activity can be launched within instrumentation"
2011-04-26 17:03:05 -07:00
Eric Fischer
9ce609a6f1
Merge "Import revised translations."
2011-04-26 16:19:04 -07:00
Conley Owens
5dbfc3b32c
am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 16:06:19 -07:00
Conley Owens
8365cd27bc
am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit '54a952c84317afc64034ded8baad3d788a54026d':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 16:01:13 -07:00
Conley Owens
93d0d8663d
am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:50:33 -07:00
Conley Owens
7f4b15761b
am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit '17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:46:32 -07:00
Romain Guy
74d72d46f2
Merge "Apply shaders/filters to text drop shadows. Bug #4318323 "
2011-04-26 15:35:27 -07:00
Mathias Agopian
3cd5a11708
Report errors when eglCreateImageKHR fails
...
Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da
2011-04-26 15:03:27 -07:00
Conley Owens
2d904f106b
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
2011-04-26 14:36:48 -07:00
Romain Guy
40b2edf77f
Merge "Update shader text to test with drop shadows."
2011-04-26 14:04:59 -07:00
Stephen Hines
74f80609af
Merge "Start ICS header cleanup and finish type matrix."
2011-04-26 13:45:51 -07:00
Kenny Root
7e002d9a3f
am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit 'fbb0e9f9846e185ba8ded63d754c4e61b1499b90':
libutils: Fix an improper const-cast in RefBase
2011-04-26 12:46:04 -07:00
Jean-Baptiste Queru
ee3098ecb8
am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '31418a1e9b905593587d8bf7a4705429db549d97':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 12:45:52 -07:00
Irfan Sheriff
943e404af4
am 4e1027e4: am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit '4e1027e45dbe292b1bdcbd3500b20f00618303f4':
Handle DHCP renewal and wakeup in framework
2011-04-26 12:45:28 -07:00
Scott Main
8ecddba5c0
am 1786fdda: am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit '1786fddabeeffcceede702005839d9544188bc33':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 12:45:15 -07:00
Eric Laurent
0833345ef3
am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
...
* commit '48dca4de70890d324b5830a58bb9fa273164151a':
Fix issue 4335692: HDMI media volume
2011-04-26 12:44:53 -07:00
Kenny Root
f3faf0bc3d
am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit 'bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930':
libutils: Fix an improper const-cast in RefBase
2011-04-26 11:45:46 -07:00
Kenny Root
dd3718af90
am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase
2011-04-26 11:41:31 -07:00
Kenny Root
b5e7f05190
am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase
2011-04-26 11:32:22 -07:00
Kenny Root
c364113a1b
Merge "libutils: Fix an improper const-cast in RefBase"
2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
62d9009da1
am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 10:24:27 -07:00
Marco Nelissen
90cd4e790d
Merge "Fix javadoc."
2011-04-26 09:37:57 -07:00
John Reck
c7b7d378a5
Merge "Adding capability to lookup many elements."
2011-04-26 09:31:48 -07:00
Irfan Sheriff
bb16d2f792
am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
Handle DHCP renewal and wakeup in framework
2011-04-26 08:54:54 -07:00