Commit Graph

22380 Commits

Author SHA1 Message Date
Jamie Gennis
309d3bb2f9 Move binder magic from the Surface class to GraphicBuffer.
- Register buffers with Gralloc when unflattening a GraphicBuffer (rather than
doing it in the Surface class).
- Add support for a GraphicBuffer that wraps an android_native_window_t*.

Change-Id: I029ac086111bbac800e5ca37eb505f558b718cd8
2010-10-10 13:09:46 -07:00
Andreas Huber
0a49dee588 Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback." 2010-10-07 13:57:08 -07:00
Chet Haase
41947f2a32 Merge "New TimeInterpolator interface for android.animation package." 2010-10-07 13:18:36 -07:00
Eric Laurent
22239a10c5 am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
2010-10-07 12:23:39 -07:00
Adam Powell
08eff4fce2 am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-07 12:23:20 -07:00
Adam Powell
33b14f5880 am 65e8b476: am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
Merge commit '65e8b476245255a96faaa70872a4196763a95e10'

* commit '65e8b476245255a96faaa70872a4196763a95e10':
  Fix bug 3064143 - remove default bold on buttons
2010-10-07 12:22:47 -07:00
Dianne Hackborn
3b4c2bc6ab am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'

* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
  Fix issue #3056500: Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Joe Onorato
4c7d73e564 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
2010-10-07 12:22:03 -07:00
Andreas Huber
a417c7d64c am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-07 12:21:33 -07:00
Kenny Root
dea4a5468c am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Jeff Brown
6d462b1221 am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'

* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
  Make secure views tolerate IME overlays.
2010-10-07 12:20:45 -07:00
Kenny Root
cafe0c0d52 am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
2010-10-07 12:20:25 -07:00
Dianne Hackborn
f16103c418 am 5d722580: (-s ours) am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d'

* commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d':
  DO NOT MERGE: Get rid of status bar's dim during night.
2010-10-07 12:20:09 -07:00
Stephen Hines
059f2e5710 Merge "Add RS testing for long and long long." 2010-10-07 11:42:13 -07:00
James Dong
5bb36168c6 Merge "Add two more options to "recordvideo" utility" 2010-10-07 11:00:25 -07:00
Mike Lockwood
130952d1c9 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
e36abb1a90 resolved conflicts for merge of 6327a9fe to master
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
2010-10-07 13:55:25 -04:00
Joe Onorato
3db1a4c16f Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Joe Onorato
5eb1a08163 Merge "Don't crash if there is no phone app and someone presses the phone button." 2010-10-07 10:03:46 -07:00
Robert Greenwalt
57ad4e3106 am b81b89f1: (-s ours) am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6'

* commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6':
  Add supporting MCC=450(Korea)
2010-10-07 09:25:54 -07:00
James Dong
92833b243f Merge "0-memcpy video recording framework" 2010-10-07 08:11:26 -07:00
satok
90b05f7bce Merge "Add InputMethodEnabler for enabling input methods and subtypes" 2010-10-06 22:46:32 -07:00
Romain Guy
d102389f27 Merge "Don't clear the framebuffer when not needed." 2010-10-06 19:51:36 -07:00
Brett Chabot
bb81a558a0 am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.
2010-10-06 17:10:48 -07:00
Adam Powell
b7a8ae8cee am 41170a1a: am abcbb1a1: Fix bug 3061544 and some clipping errors.
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9'

* commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9':
  Fix bug 3061544 and some clipping errors.
2010-10-06 17:08:52 -07:00
Hung-ying Tyan
fd11889bdd am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'

* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
  SIP: add SERVER_UNREACHABLE error code.
2010-10-06 17:08:43 -07:00
Hung-ying Tyan
fb7246923f am 3cb2d3be: am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '3cb2d3be6cb501c77c7a5765d954363125857cca'

* commit '3cb2d3be6cb501c77c7a5765d954363125857cca':
  SipService: supply PendingIntent when open a profile.
2010-10-06 17:08:34 -07:00
Dianne Hackborn
b19b10d1af am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'

* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
  Make it easier to figure out whether an app can go on sd card.
2010-10-06 17:08:15 -07:00
Neal Nguyen
ec8a3938e4 am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'

* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
  Fixing some flakiness of some DL Manager tests.
2010-10-06 17:07:58 -07:00
Jeff Brown
25d89261d3 am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'

* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
  Fix Looper leaks in MediaRecorderStressTest.
2010-10-06 17:07:49 -07:00
Mathias Agopian
e1c290b97d am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'

* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-06 17:07:39 -07:00
Mathias Agopian
fbd5d01528 am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'

* commit '722665c5f76e81bed646490977ea30f38aaa00da':
  fix build. SurfaceView.setFrame needed to be hidden
2010-10-06 17:07:30 -07:00
Mathias Agopian
0e7e760651 Merge "resolved conflicts for merge of bba3b8ef to master" 2010-10-06 17:04:44 -07:00
Mathias Agopian
c502f54cca resolved conflicts for merge of bba3b8ef to master
Change-Id: I4a63f4be3b9f7d236e03e9b27f6d1da6f8ced449
2010-10-06 17:03:41 -07:00
Romain Guy
9fae8611c7 Merge "Apply 3D transformations to gradient shaders." 2010-10-06 17:00:20 -07:00
Mathias Agopian
f5c9adb410 resolved conflicts for merge of 9fa7926b to master
Change-Id: I0d597d431ecebfb9d9d6e7902689c9ba95e75876
2010-10-06 16:53:36 -07:00
Mathias Agopian
3e41484e80 Merge "libagl: eglSwapInterval fix" 2010-10-06 16:45:56 -07:00
Ari Hirvonen
551dc26ebd libagl: eglSwapInterval fix
SW egl returned always EGL_FALSE even when the display was valid.
This made calls to eglSwapInterval to fail on HW since the wrapper
fails if either SW or HW egl fails.

Letting SW eglSwapInterval to return true when display is valid is
ok since spec says that interval parameter is silently clamped.

Change-Id: Ib4aa1dbfccf510a0f36621796e79a4d46852ee6a
2010-10-06 16:44:37 -07:00
Adam Powell
35641956fe am 815b1eb8: (-s ours) am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846'

* commit '815b1eb870ea5b1d28de5be768d49e95c776c846':
  Fix bug 3061769
2010-10-06 16:22:03 -07:00
Mathias Agopian
00dd37af79 am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'

* commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-06 16:17:44 -07:00
Elliott Hughes
fa30d1e305 am 86214276: am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '86214276e05d81e4820862341ce9e2e3c83cd136'

* commit '86214276e05d81e4820862341ce9e2e3c83cd136':
  Manually revert a single-line error inserted by OpenJDK.
2010-10-06 16:17:27 -07:00
James Dong
a80cbaa4df am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-06 16:17:14 -07:00
Nick Pelly
df74c7f049 am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'

* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
  New API stubs: NdefMessage and NdefRecord.
2010-10-06 16:16:56 -07:00
Alex Sakhartchouk
78a681f809 Merge "changing vec4 to vec2 for perf reasons." 2010-10-06 16:09:36 -07:00
Gilles Debunne
33e533b162 am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'

* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
  Revert "Restored ic_dialog_menu_generic asset."
2010-10-06 16:07:42 -07:00
Gilles Debunne
8d94bc0e6a resolved conflicts for merge of 1153629c to master
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
2010-10-06 14:38:27 -07:00
Marco Nelissen
5480226205 Merge "Fix simulator build, part 1/n" 2010-10-06 12:26:23 -07:00
Neel Parekh
975314d483 Merge "Fix pressed vs selected typo in onCreateDrawableState" 2010-10-06 11:45:55 -07:00
Irfan Sheriff
3288742644 Merge "Add LinkAddress" 2010-10-06 11:26:44 -07:00
Gil Dobjanschi
6250dcdb63 Merge "Added VideoEditor reference to protected AudioTrack constructor" 2010-10-06 11:26:24 -07:00