Commit Graph

21636 Commits

Author SHA1 Message Date
James Dong
535b68553e am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:17:30 -07:00
James Dong
b3cc6a47f2 Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread 2010-09-23 10:11:04 -07:00
Robert Greenwalt
6215bf1a2c am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105'

* commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105':
  Cleanup Netd to prevent getting hung.
2010-09-23 09:40:20 -07:00
Kristian Monsen
564acdc7ba Merge "Fix deadlock in HTTP authentication within synchronous request." 2010-09-23 09:08:32 -07:00
Robert Greenwalt
36e39984cb am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.
2010-09-23 08:48:14 -07:00
Robert Greenwalt
63d0074b5a Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
satok
4f189d85f6 Merge "Add methods for managing subtypes" 2010-09-23 00:28:25 -07:00
repo sync
aca14882aa am c0f2d952: am 0b7d6de1: Fix the build.
Merge commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604'

* commit 'c0f2d9522ea5891352e219c4ca8f85ac59287604':
  Fix the build.
2010-09-23 00:11:07 -07:00
Chia-chi Yeh
a6e71deb3f resolved conflicts for merge of 2b652855 to master
Change-Id: I3604c95530823605d66cb56be7a37c55399a9271
2010-09-23 14:59:58 +08:00
repo sync
8af2cf4ee0 am 0b7d6de1: Fix the build.
Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp

* commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9':
  Fix the build.
2010-09-22 23:56:42 -07:00
repo sync
cefce2967e am 75c3853e: Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp

* commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92':
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:17:24 -07:00
repo sync
938db5b127 Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
* changes:
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00
Wei-Ta Chen
913c0bbdb1 am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
  Unhide BitmapRegionDecoder.
2010-09-22 23:06:55 -07:00
Wei-Ta Chen
e73d757d26 am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Romain Guy
0bf5b2db2f Merge "Correctly initialize/refresh layers." 2010-09-22 22:52:40 -07:00
Adam Powell
24a47fb302 am 37e3f49f: (-s ours) am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit '37e3f49fb4b5ac23a985ab12b7951523be54b688'

* commit '37e3f49fb4b5ac23a985ab12b7951523be54b688':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 22:07:40 -07:00
Adam Powell
73a41636a2 am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp

* commit 'e81894201979513de87269a21a1802da72d2b954':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 21:10:41 -07:00
Adam Powell
4a220ba58d Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread 2010-09-22 21:08:10 -07:00
Mike Lockwood
65bde7458c Merge "MediaScanner: disable album artist support until MediaProvider really supports it" 2010-09-22 20:30:48 -07:00
Romain Guy
3bf9e8500e Merge "Draw text decorations with lines instead of rectangles." 2010-09-22 19:50:27 -07:00
Mathias Agopian
73d3ba9e50 add a way to toggle the h/w composer at runtime
to DISABLE the h/w composer:
  adb shell service call SurfaceFlinger 1008 i32 1

to ENABLE the h/w composer:
  adb shell service call SurfaceFlinger 1008 i32 0

the state is dumped in "dumpsys SurfaceFlinger"

Change-Id: I23e2242d42c6e3fd5261a83332dd900b189e38ce
2010-09-22 18:58:01 -07:00
Mike Lockwood
910a2377f6 Merge "Changes to support MediaProvider refactoring" 2010-09-22 18:50:06 -07:00
Brad Fitzpatrick
27a53a9d60 am 1c384697: am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42'

* commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:37:11 -07:00
Brad Fitzpatrick
9f170b33c5 am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp

* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:33:46 -07:00
Joe Onorato
ce57ccf90d am 19c4b29d: am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '19c4b29d46aece70dbe532ba9078c904fbc62502'

* commit '19c4b29d46aece70dbe532ba9078c904fbc62502':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:33:54 -07:00
Joe Onorato
1120296d6c am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp

* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:29:49 -07:00
Amith Yamasani
81944e7a45 am abdd2c7f: am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'

* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 17:06:48 -07:00
John Wang
96eead6ba7 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-22 17:06:45 -07:00
Dmitri Plotnikov
1eb637cc75 Merge "Adding PHOTO_URI and PHOTO_THUMBNAIL_URI." 2010-09-22 17:05:28 -07:00
Eric Laurent
97458e3728 am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'

* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
  Request permission for global audio effects.
2010-09-22 17:04:48 -07:00
Steve Howard
38cfd28c6f am 1d056cd6: am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624'

* commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 17:04:15 -07:00
Eric Laurent
dcd5ecfa92 am 4744774a: am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '4744774a7a3644489ec1159f5554a41eb943a51b'

* commit '4744774a7a3644489ec1159f5554a41eb943a51b':
  Fix more audio effects auto tests
2010-09-22 17:03:41 -07:00
Romain Guy
8dbae0836b Merge "Fix OpenGL errors in various places." 2010-09-22 16:46:37 -07:00
Amith Yamasani
bdef848c22 am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 16:35:11 -07:00
Amith Yamasani
44db6e1fa4 Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread 2010-09-22 16:29:49 -07:00
Eric Laurent
35980c6c74 am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp

* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
  Request permission for global audio effects.
2010-09-22 16:05:37 -07:00
Steve Howard
9bf4362ae3 am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '127146ee1c716d785fd70207045625c0c1f1d1ef' into gingerbread-plus-aosp

* commit '127146ee1c716d785fd70207045625c0c1f1d1ef':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 16:05:03 -07:00
Eric Laurent
7a31199704 Merge "Request permission for global audio effects." into gingerbread 2010-09-22 16:00:59 -07:00
Eric Laurent
ea1a2e5d1d am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
  Fix more audio effects auto tests
2010-09-22 15:59:28 -07:00
Jason Sams
66e60ba16a Merge "Better debugging for scripts." 2010-09-22 15:59:06 -07:00
Steve Howard
e05595c170 Merge "Decrease sensitivity of orientation changes a bit." into gingerbread 2010-09-22 15:57:12 -07:00
Eric Laurent
3f9dab6a7d Merge "Fix more audio effects auto tests" into gingerbread 2010-09-22 15:53:49 -07:00
Andreas Huber
dbb9affde3 am 2de0a50a: am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1'

* commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 15:44:23 -07:00
Andreas Huber
863f93db94 am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp

* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 15:38:43 -07:00
Brad Fitzpatrick
c1a1452f4c am 9317801a: am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f'

* commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f':
  Flesh out StrictMode docs.
2010-09-22 15:36:11 -07:00
Andreas Huber
250522c661 Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread 2010-09-22 15:34:00 -07:00
Brad Fitzpatrick
4b1a236d00 am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9' into gingerbread-plus-aosp

* commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9':
  Flesh out StrictMode docs.
2010-09-22 15:30:05 -07:00
Brad Fitzpatrick
060b5f6757 Merge "Flesh out StrictMode docs." into gingerbread 2010-09-22 15:25:26 -07:00
Jason Sams
eae2aeb37d Merge "Remove excessive logging." 2010-09-22 14:52:01 -07:00
Romain Guy
9d3be978f2 Merge "Fix texture corruption issue, faster re-upload of textures." 2010-09-22 14:45:04 -07:00