Commit Graph

17052 Commits

Author SHA1 Message Date
Mathias Agopian
574a26fa52 am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp

* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-03 11:30:42 -07:00
Mathias Agopian
f4c9140784 Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 2010-08-03 11:29:15 -07:00
Konstantin Lopyrev
a537fcb653 am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
Merge commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp

* commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8':
  Improving profiling of views.
2010-08-03 11:26:25 -07:00
Konstantin Lopyrev
92cb9ba930 am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp

* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
  Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
5541117c6e Merge "Improving profiling of views." into gingerbread 2010-08-03 11:24:23 -07:00
James Dong
4bd9ffb445 am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp

* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
  File writer has a designated writer thread now
2010-08-03 10:37:32 -07:00
James Dong
c59e3d21c8 Merge "File writer has a designated writer thread now" into gingerbread 2010-08-03 10:35:55 -07:00
James Dong
d5e854edcf am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp

* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
  Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-03 10:10:31 -07:00
James Dong
902e2d3d1a Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread 2010-08-03 09:59:11 -07:00
Mathias Agopian
24035338ed fix [2421247] implement eglGetProcAddress(), needed in the ndk
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
2010-08-02 18:23:36 -07:00
James Dong
7744d40e3e am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp

* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
  Add lost frame handling in AudioSource
2010-08-02 18:15:48 -07:00
James Dong
8535375e2e Merge "Add lost frame handling in AudioSource" into gingerbread 2010-08-02 18:13:54 -07:00
Scott Main
8d4f3200ee am f2d16bc5: am 5aa4680e: update device dashboard
Merge commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp

* commit 'f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
  update device dashboard
2010-08-02 17:45:05 -07:00
Scott Main
5e11d7ad9f am 5aa4680e: update device dashboard
Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread

* commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
  update device dashboard
2010-08-02 17:42:11 -07:00
Steve Howard
8c93917209 am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7' into gingerbread-plus-aosp

* commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7':
  New secure setting for mobile download size limit.
2010-08-02 16:51:52 -07:00
Steve Howard
c56eae725e Merge "New secure setting for mobile download size limit." into gingerbread 2010-08-02 16:49:22 -07:00
John Wang
e7a311ac06 am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp

* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
2010-08-02 15:33:47 -07:00
John Wang
156abdaf99 Merge changes Ic30e2801,I387bab4d into gingerbread
* changes:
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
2010-08-02 15:31:37 -07:00
Christopher Tate
25a04d660b am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp

* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
  Mute a common-case progress log about input injection
2010-08-02 15:19:19 -07:00
Christopher Tate
47890f3257 Merge "Mute a common-case progress log about input injection" into gingerbread 2010-08-02 15:14:44 -07:00
Kenny Root
3880ae55fe am 739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp

* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
  Do not deference before null check
2010-08-02 13:29:01 -07:00
Kenny Root
2a4e1249de Merge "Do not deference before null check" into gingerbread 2010-08-02 12:33:40 -07:00
Wink Saville
4a2218b098 am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:06:34 -07:00
Wink Saville
10375734e1 am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Scott Main
3fcc418cff am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
  Doc change: Add nexus one to dev phones.
2010-08-02 09:29:49 -07:00
Scott Main
aa57958f88 am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.
2010-08-02 09:23:50 -07:00
Scott Main
1cf67def06 Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Brad Fitzpatrick
4a6d42004c am ee34a49f: Add missing word from docs.
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
2010-08-02 08:02:05 -07:00
Dianne Hackborn
e0991296b9 am 543f250d: Merge "Make the systemui process persistent." into gingerbread
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
2010-07-30 19:12:50 -07:00
Dianne Hackborn
64a74f6537 Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00
Mathias Agopian
d7beac601a am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
2010-07-30 18:03:17 -07:00
Mathias Agopian
3efd03a3c2 Merge "remove copybit hack from software opengl (libagl)" into gingerbread 2010-07-30 18:01:25 -07:00
Dirk Dougherty
86486c255f am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
2010-07-30 17:40:28 -07:00
Dirk Dougherty
6e6cc2014f am 2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread

* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
  Doc change: Cleanup for licensing doc.
2010-07-30 17:37:39 -07:00
Kenny Root
d3326a9d8f am 8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
2010-07-30 17:00:01 -07:00
Kenny Root
20f352905f Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Brad Fitzpatrick
ec38d3234f am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
36b022e7c2 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
James Dong
78316abcec am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
2010-07-30 14:52:05 -07:00
Jeff Brown
333e73fc91 am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread
Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp

* commit '00e5c61366d3d3d62c259277823ea15a14f68ad4':
  Improve thread safety of input mappers.
2010-07-30 14:49:43 -07:00
James Dong
6c9c4ea978 Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 2010-07-30 14:49:23 -07:00
Jeff Brown
68e491d5da Merge "Improve thread safety of input mappers." into gingerbread 2010-07-30 14:48:25 -07:00
Jeff Brown
b51719b9ae Improve thread safety of input mappers.
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.

Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
2010-07-30 14:43:58 -07:00
James Dong
e07e4c0a7b am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
  Lower the lower bound for max file duration check
2010-07-30 14:30:31 -07:00
James Dong
1ec47739f6 Merge "Lower the lower bound for max file duration check" into gingerbread 2010-07-30 14:28:26 -07:00
Xia Wang
8414dc0c48 am 131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
2010-07-30 13:46:24 -07:00
Xia Wang
7cfd5ebcc7 Merge "DO NOT MERGE" into gingerbread 2010-07-30 13:44:23 -07:00
Andreas Huber
66fe330690 am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp

* commit '432c5b6c1d4181194cb82a14107b6d10105231a9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-30 12:18:58 -07:00
Andreas Huber
f94c59413e am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread

* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-30 12:15:02 -07:00
Jean-Baptiste Queru
11472cedc7 am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread
Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights
2010-07-30 12:13:43 -07:00