33496 Commits

Author SHA1 Message Date
Scott Main
d9ae8ba9d9 am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides
Merge commit '7bfac24dcb5ec532b822507816929931e5e19002'

* commit '7bfac24dcb5ec532b822507816929931e5e19002':
  docs: new web apps dev guides
2010-10-10 19:13:36 -07:00
Brad Fitzpatrick
764437aa9e am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'

* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
  Minor SharedPreference clean-up.
2010-10-10 19:13:24 -07:00
Dianne Hackborn
cc60839643 am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'

* commit '681f327e839a40a4d55d3567af341b9e90f62378':
  Fix retaining of granted permissions when updating of system app.
2010-10-10 19:13:09 -07:00
Dianne Hackborn
65bdf4e634 am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
2010-10-10 19:11:51 -07:00
Jean-Baptiste Queru
fae998c860 resolved conflicts for merge of 7c08b70c to master
Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088
2010-10-10 19:02:41 -07:00
Gilles Debunne
a20e873476 resolved conflicts for merge of d7d47941 to master
Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e
2010-10-10 18:45:23 -07:00
Jason Sams
9e3120518a Merge "Cleanup error message for null binding address. Only print the debug if script debugging is enabled." 2010-10-10 18:04:11 -07:00
Jason Sams
2222aa9003 Cleanup error message for null binding address.
Only print the debug if script debugging is enabled.

Change-Id: I72b9c2a73d49987a73b354442e9defec02b93bc6

Implement inner utiliy class to specify surface formats.
Remove boxed bitmap upload functions.

Change-Id: I3ff5ca59e53d02b9d75277afa947ea3d218459eb
2010-10-10 17:58:25 -07:00
Dianne Hackborn
50d3fa72d8 am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
2010-10-10 17:47:01 -07:00
Jean-Baptiste Queru
d755d11e93 am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"
Merge commit '965d533733f0c5cd9c02813e32737b0b0ce552d0'

* commit '965d533733f0c5cd9c02813e32737b0b0ce552d0':
  NullPointerException at handleMessage(GSMPhone.java)
2010-10-10 17:46:37 -07:00
Brad Fitzpatrick
8775eae941 am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc'

* commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc':
  DropBoxManager.Entry implements Closeable
2010-10-10 17:46:10 -07:00
Andreas Huber
023266c34c am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'

* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
  Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
2010-10-10 17:45:58 -07:00
Jeff Brown
325b05f611 am b13998f2: am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
Merge commit 'b13998f2b482ff0ebe96cd683801758a01d10799'

* commit 'b13998f2b482ff0ebe96cd683801758a01d10799':
  Clarify some comments on individual key codes.
2010-10-10 17:45:25 -07:00
Mindy Pereira
68bdfadf29 am ab70a98b: (-s ours) am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit 'ab70a98b0ec450379fa953a9fe911109329b9c37'

* commit 'ab70a98b0ec450379fa953a9fe911109329b9c37':
  DO NOT MERGE Adjust amount pull effects the glow and edge decay.
2010-10-10 17:45:13 -07:00
Mike Lockwood
ca936f1661 am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit '98e1f3840f06d3dfea987154da25d5351460d080'

* commit '98e1f3840f06d3dfea987154da25d5351460d080':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-10 17:15:06 -07:00
Andreas Huber
37de60c179 am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-10 17:14:53 -07:00
Andreas Huber
cb4e407680 am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'

* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-10 17:14:35 -07:00
James Dong
80ab64d7aa am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit 'd31fc2397a494fc54679ac8fdb52983b60287183'

* commit 'd31fc2397a494fc54679ac8fdb52983b60287183':
  Name the writer threads
2010-10-10 17:13:51 -07:00
Andreas Huber
2ddbd7d9f8 am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'

* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-10 17:13:28 -07:00
Gilles Debunne
7499a1ca68 resolved conflicts for merge of 5d146549 to master
Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b
2010-10-10 16:50:28 -07:00
Eric Laurent
329430a54e am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'

* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
  Added getter for session Id to AudioSink
2010-10-10 16:06:04 -07:00
Andreas Huber
438a17292a am d96a068c: am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76'

* commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-10 16:05:44 -07:00
Romain Guy
f673689d68 Merge "Reset the dirty region after drawing in hardware." 2010-10-10 15:49:14 -07:00
Romain Guy
fd5072606b Reset the dirty region after drawing in hardware.
Change-Id: I687419f2a95d5d7c51913467bd80249244102725
2010-10-10 15:46:46 -07:00
Chung-yih Wang
e06be94118 am 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'

* commit '77880ae4187d92506848249585687fc9d0c0dd25':
  SipService: add permission check for using API
2010-10-10 14:21:18 -07:00
Dianne Hackborn
615e2fa175 am b77455ee: am 78d68836: Implement tracking of package install times.
Merge commit 'b77455ee290691b036ac79236a93e57ff294ef0c'

* commit 'b77455ee290691b036ac79236a93e57ff294ef0c':
  Implement tracking of package install times.
2010-10-10 14:20:34 -07:00
Marco Nelissen
3caeffac54 am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit '779a6e41d7e5cdb27b802551249257d600dc2d27'

* commit '779a6e41d7e5cdb27b802551249257d600dc2d27':
  Do not merge.
2010-10-10 14:20:06 -07:00
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