drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,402 Commits 1 Branch 0 Tags
Commit Graph

33402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
5bc3addb45 am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread 
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
 2010-10-10 14:19:52 -07:00
Hung-ying Tyan
3d59480dc2 am ea445758: am 08faac3c: Unhide SIP API. 
Merge commit 'ea445758efba6b728d5e597402e9d9538f3ef451'

* commit 'ea445758efba6b728d5e597402e9d9538f3ef451':
  Unhide SIP API.
 2010-10-10 14:19:29 -07:00
Hung-ying Tyan
6450a4af26 am 647ff645: am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread 
Merge commit '647ff64596399e0fa234622302e03facf84ee3f6'

* commit '647ff64596399e0fa234622302e03facf84ee3f6':
  Use explicit intent for installing credentials.
 2010-10-10 14:18:53 -07:00
Gilles Debunne
91a359e0d1 Merge "resolved conflicts for merge of bd38710b to master" 2010-10-10 14:00:43 -07:00
Gilles Debunne
a89af70cdc resolved conflicts for merge of bd38710b to master 
Change-Id: I3489b6909ce2a215318d45f809b82579503fd733
 2010-10-10 13:55:49 -07:00
Mike Lockwood
cde08e339e current.xml: Fix LIGHT_NO_MOON value. 
Change-Id: Ibb4cce6b33e6cf4b164a8f594c21727891bc6ff0
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2010-10-10 16:51:17 -04:00
Adam Powell
b462f88f1e Merge "Fix 3082859 - missing mdpi text handle assets" 2010-10-10 13:46:08 -07:00
Adam Powell
6587e57a68 Fix 3082859 - missing mdpi text handle assets 
Change-Id: I94fda1db4ef358d21f63ad057b088d68133ab4b4
 2010-10-10 13:43:01 -07:00
Jamie Gennis
584ad9af40 Merge "Move binder magic from the Surface class to GraphicBuffer." 2010-10-10 13:36:13 -07:00
Doug Zongker
ee04af3ed4 add a local filename column to download queries 
Some users of the download API (eg system update) need to get the
actual local filename of a downloaded file, not just a content URI.

Change-Id: I877e2776e778c1712f654ba5c840bfe6ed3fe60f
 2010-10-10 13:29:09 -07:00
Jamie Gennis
1ef773ff9c 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
Jaikumar Ganesh
90078b3f16 am f5cae7d1: (-s ours) am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread 
Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'

* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
 2010-10-10 12:55:30 -07:00
Mindy Pereira
cefb3be959 am 6c4609ad: (-s ours) am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 
Merge commit '6c4609ada4526eea2fca4eef043d27dd07026e0a'

* commit '6c4609ada4526eea2fca4eef043d27dd07026e0a':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
 2010-10-10 12:54:26 -07:00
Chung-yih Wang
2473f94718 am 4b7ff734: am 4483232f: Suppress harder for echo without affecting the volume of real voice. 
Merge commit '4b7ff734611666a68471c97fabb6f516efab25cd'

* commit '4b7ff734611666a68471c97fabb6f516efab25cd':
  Suppress harder for echo without affecting the volume of real voice.
 2010-10-10 12:54:13 -07:00
Jeff Brown
4475c0edcc am f10929fb: am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread 
Merge commit 'f10929fb350395c21edd2cba7641479afe75e750'

* commit 'f10929fb350395c21edd2cba7641479afe75e750':
  Minor fix for InputReader support for non-touchscreen devices.
 2010-10-10 12:53:39 -07:00
Mindy Pereira
02611a7280 am 4f2c8cc8: (-s ours) am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 
Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe'

* commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
 2010-10-10 12:53:26 -07:00
Xia Wang
ceb13338e6 am d185494d: (-s ours) am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread 
Merge commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f'

* commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f':
  Port mock ril controller and tests to GB. DO NOT MERGE
 2010-10-10 12:53:10 -07:00
Gilles Debunne
4f7bb9ae9f am c6faec80: am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread 
Merge commit 'c6faec80d26a352c86317cbf92174c8e5cd8f0c5'

* commit 'c6faec80d26a352c86317cbf92174c8e5cd8f0c5':
  Removing 'last' of red cross asset.
 2010-10-10 12:52:55 -07:00
Jeff Brown
d5da367024 am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 
Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'

* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
  Switch Looper back to using poll() instead of epoll().
 2010-10-10 12:52:40 -07:00
Gloria Wang
bcf74accaf am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp 
Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382'

* commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382':
  Update of DRM framework.
 2010-10-10 12:51:00 -07:00
Andreas Huber
06dfa35e3c am bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 
Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'

* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
 2010-10-10 11:25:54 -07:00
Justin Ho
22b379ad17 am 51501aa8: (-s ours) am b74941e3: Merge "Fixed popup assets (background)" into gingerbread 
Merge commit '51501aa8703c15c6156ba14774f3ff41cde31700'

* commit '51501aa8703c15c6156ba14774f3ff41cde31700':
  Fixed popup assets (background)
 2010-10-10 11:25:41 -07:00
Adam Powell
707fb0e0e5 am b3616395: am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 
Merge commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee'

* commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
 2010-10-10 11:16:32 -07:00
Brad Fitzpatrick
38051bc018 am 6a15f0d7: am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread 
Merge commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023'

* commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023':
  Quiet unnecessary debug logging.
 2010-10-10 11:16:16 -07:00
Andreas Huber
72662b1abe am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 
Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
 2010-10-10 11:16:01 -07:00
Kenny Root
7a2eff1fc7 am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'

* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
  Eliminate MCS_GIVE_UP state
 2010-10-10 11:15:44 -07:00
Gilles Debunne
441d198023 am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread 
Merge commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4'

* commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4':
  Removed unused and broken screen_progress
 2010-10-10 11:15:28 -07:00
Brad Fitzpatrick
71ce18b0b7 am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love. 
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'

* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
  More DropBoxManager javadoc love.
 2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
ceda3a972c am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread 
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'

* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
  DropBox.Entry javadoc syntax fix
 2010-10-10 11:14:56 -07:00
Kenny Root
3aa837cc0f am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'

* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-10 11:14:31 -07:00
Jean-Baptiste Queru
264c2cfe4d resolved conflicts for merge of 5df4b5a7 to master 
Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
 2010-10-10 11:09:45 -07:00
James Dong
6fcd10bf4c Merge "0-memcpy video recording framework" 2010-10-10 10:01:31 -07:00
Eric Rowe
d206c874cf am 82aacdde: (-s ours) am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 
Merge commit '82aacddef99e5cfc399d02702f2a336af8fbd59f'

* commit '82aacddef99e5cfc399d02702f2a336af8fbd59f':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
 2010-10-10 09:09:20 -07:00
Wink Saville
3201b398d1 am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 
Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'

* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
  Changed handling of onQueryCompelete to not use mimeType.
 2010-10-10 09:08:55 -07:00
James Dong
997eaa2c7c 0-memcpy video recording framework 
Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
 2010-10-09 01:21:20 -07:00
Stephen Hines
4c0c81a307 Merge "Remove pragma for RS export variables." 2010-10-09 00:21:56 -07:00
Romain Guy
c4e43d80b3 Merge "Move GenerationCache to the utils directory." 2010-10-08 18:47:45 -07:00
Romain Guy
21b028a44f Move GenerationCache to the utils directory. 
Change-Id: I210ffa8f1d76a102bb7d971c649c20a74d03fbe6
 2010-10-08 18:44:56 -07:00
James Dong
7ea6ebe73a Merge "Move Camera specific logic out from StagefrightRecorder to CameraSource" 2010-10-08 18:39:13 -07:00
Romain Guy
b154dfe757 Merge "Don't update 9patches on every frame." 2010-10-08 18:39:04 -07:00
Romain Guy
2728f96161 Don't update 9patches on every frame. 
Change-Id: I7ffb2365f83e0453e7d0a0cdcb3fc9308b305238
 2010-10-08 18:36:57 -07:00
James Dong
0c128b67f0 Move Camera specific logic out from StagefrightRecorder to CameraSource 
o updated comments and streamlined the logic in
  checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
 2010-10-08 18:32:43 -07:00
Wu-cheng Li
e1199e382f am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
 2010-10-08 18:28:38 -07:00
Hung-ying Tyan
c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Adam Powell
d856b1ce92 resolved conflicts for merge of 86b50028 to master 
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
 2010-10-08 18:23:49 -07:00
Stephen Hines
5a6d7ac2bd Remove pragma for RS export variables. 
Change-Id: Icfd958e8212843f4f1a6b64dd43ce63e09d00d7c
 2010-10-08 18:12:51 -07:00
Dianne Hackborn
ca33268ef8 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-08 17:59:52 -07:00
Eric Fischer
c400cbb45d am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
 2010-10-08 17:59:33 -07:00
Xavier Ducrohet
79d433dd87 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
 2010-10-08 17:59:13 -07:00
Hung-ying Tyan
1d8db8a0a8 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00