Commit Graph

26896 Commits

Author SHA1 Message Date
Mathias Agopian
7e857823df am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-29 09:40:51 -08:00
Mathias Agopian
73e4ee6289 am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-29 09:40:34 -08:00
Mathias Agopian
c9682070f0 am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-29 09:40:25 -08:00
Mathias Agopian
13c0c9559d am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-29 09:40:14 -08:00
Mathias Agopian
8b770ca695 am d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
  minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-29 09:40:06 -08:00
Jean-Baptiste Queru
c3d0dea07d Merge f126ad3b from gingerbread
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
2011-01-29 09:37:44 -08:00
Marco Nelissen
1fa0ee01da am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
  Increase the number of useful bits in the spectrum.
2011-01-29 09:32:05 -08:00
Nick Pelly
8017007350 am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
2011-01-29 09:31:56 -08:00
Hung-ying Tyan
6d3a36b76e am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
2011-01-29 09:31:40 -08:00
Hung-ying Tyan
55e2207ada am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-29 09:31:19 -08:00
Jeff Brown
a413f9404d am d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-29 09:27:55 -08:00
Andreas Huber
9f1385bc2b am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-29 07:30:57 -08:00
Justin Ho
712a842b37 am 28c4f69a: Updated checkbox assets
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
2011-01-29 07:30:39 -08:00
Arnaud Ferir
4efa5a3d8c am 5e81a6e2: Fix trace mismatch.
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
a93e5f9af8 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-29 07:29:56 -08:00
John Wang
0b87cf22e0 am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
2011-01-29 07:29:42 -08:00
Jean-Baptiste Queru
4d10702aee Merge c896d85c from gingerbread
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
e6a6469f0a Merge da01b4ab from gingerbread
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
2011-01-29 07:17:22 -08:00
Jeff Hamilton
528a3b97f1 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
2011-01-29 07:09:21 -08:00
Jim Miller
6eee7f2dbc am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-29 07:08:58 -08:00
Robert Greenwalt
62e5b62d7f Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Robert Greenwalt
1fc7c8ff4b Merge "Don't use mobile networktype icon if not connected" into honeycomb 2011-01-29 06:35:57 -08:00
Justin Ho
d453b0cbbf Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
74c7bb3ccc Merge "New honeycomb sound set" into honeycomb 2011-01-28 19:18:51 -08:00
Joe Onorato
67e95b1960 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Jaikumar Ganesh
c0cd516cde am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
2011-01-28 18:45:14 -08:00
John Reck
3089e2284a am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '398a589ccea744556732b25097412dbb22c51271':
  DO NOT MERGE - Create db path if it doesn't exit
2011-01-28 18:44:57 -08:00
Jeff Hamilton
1dd3301c8c resolved conflicts for merge of dc54a8c7 to honeycomb-merge
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
2011-01-28 20:41:42 -06:00
Mathias Agopian
779160c4ea Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb 2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.

Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
2011-01-28 18:23:24 -08:00
Jamie Gennis
68f9127e88 Reset ANativeWindow crop on buffer geometry changes.
This changes the ANativeWindow API and the two implementations to reset
the window's crop rectangle to be uncropped when the window's buffer
geometry is changed.

Bug: 3359604
Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
2011-01-28 18:21:54 -08:00
Jason Sams
56a764c39c Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb 2011-01-28 17:56:28 -08:00
Jason Sams
c5b1fe9236 Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb 2011-01-28 17:56:09 -08:00
Jean-Michel Trivi
58ac4b4923 am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
  Bug 3365937 notify TTS initialization listener of binding errors
2011-01-28 17:37:12 -08:00
Xavier Ducrohet
0f962411f8 Merge "LayoutLib: update with Pair API." into honeycomb 2011-01-28 17:21:57 -08:00
Joe Onorato
a618e56e61 Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb 2011-01-28 16:38:01 -08:00
Dianne Hackborn
8bd4cefdb4 Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 2011-01-28 16:34:02 -08:00
Jim Miller
11ae43006e Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb 2011-01-28 16:21:38 -08:00
Chet Haase
bb58b9cc90 Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb 2011-01-28 16:19:32 -08:00
Eric Fischer
a7442c9587 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:16 -08:00
Justin Ho
31db9b8551 Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Brian Muramatsu
12ef5792f0 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Romain Guy
3845b92378 Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Jamie Gennis
155c93ad47 Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 2011-01-28 14:12:57 -08:00
Eric Fischer
bb3356d637 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Gilles Debunne
2948bb3f5f Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb 2011-01-28 14:07:12 -08:00
Adam Powell
7791f904da Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
ee37f4d420 Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:40:45 -08:00
Joe Onorato
311e33ddd1 Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 2011-01-28 13:40:28 -08:00
Dianne Hackborn
e40389171f Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 2011-01-28 12:44:52 -08:00