Commit Graph

4418 Commits

Author SHA1 Message Date
Eddie Ho
1208801d1b am 71119048: Merge change 23949 into eclair
Merge commit '7111904802934e1fa4cf68c445f13c34c30c9cdb' into eclair-plus-aosp

* commit '7111904802934e1fa4cf68c445f13c34c30c9cdb':
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:50:59 -07:00
Android (Google) Code Review
b3668975ab Merge change 23949 into eclair
* changes:
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:49:11 -07:00
Andrei Popescu
1a57fba26f am 34619494: Merge change 23804 into eclair
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp

* commit '34619494e009d998f5c073145c0481e38bbd2bcf':
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:29:36 -07:00
Android (Google) Code Review
c395c346c5 Merge change 23804 into eclair
* changes:
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:27:47 -07:00
Jesse Wilson
cc16c8de84 am f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit 'f163f7f0f29f0898eb82f54cf657cb34668abade' into eclair-plus-aosp

* commit 'f163f7f0f29f0898eb82f54cf657cb34668abade':
  do not merge: fix API current.xml for Hashtable.
2009-09-03 18:23:40 -07:00
Jesse Wilson
411b27a924 am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp

* commit '6de753bffe47e796942272692869992f62f8f0ab':
  do not merge: update API for Josh's optimizations for Eclair
2009-09-03 17:50:58 -07:00
Dmitri Plotnikov
f6f4763092 am 1ab3ebad: Merge change 23906 into eclair
Merge commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp

* commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06':
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:31:26 -07:00
Android (Google) Code Review
5c5844b313 Merge change 23906 into eclair
* changes:
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:29:44 -07:00
Andreas Huber
b7043e6c32 am a19cb68b: Merge change 23908 into eclair
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp

* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:25:48 -07:00
Android (Google) Code Review
8e7e2b80df Merge change 23908 into eclair
* changes:
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:24:46 -07:00
Wink Saville
6b067efbfd am ccc41a26: Merge change 23870 into eclair
Merge commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp

* commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435':
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:56:10 -07:00
Android (Google) Code Review
44946b9f87 Merge change 23870 into eclair
* changes:
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:54:22 -07:00
Jason Sams
045598fe2e am 4879d0d0: Merge change 23890 into eclair
Merge commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2' into eclair-plus-aosp

* commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2':
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:50:02 -07:00
Android (Google) Code Review
4f01710579 Merge change 23890 into eclair
* changes:
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:47:39 -07:00
Jaikumar Ganesh
dea739f6bb am 7c599e02: Merge change 21774 into eclair
Merge commit '7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp

* commit '7c599e0288fb4ad9d393467458f59c45638d04ec':
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:46:03 -07:00
Android (Google) Code Review
2483a0c05a Merge change 21774 into eclair
* changes:
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:45:00 -07:00
Dianne Hackborn
e08b3cbef2 am ebf0bbaa: Merge change 23868 into eclair
Merge commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp

* commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57':
  Add better service reporting.
2009-09-03 14:37:37 -07:00
Mike Lockwood
003b7fc6fd am e131b746: Merge change 23861 into eclair
Merge commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp

* commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9':
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:37:33 -07:00
Android (Google) Code Review
62b7aaccae Merge change 23868 into eclair
* changes:
  Add better service reporting.
2009-09-03 14:36:28 -07:00
Android (Google) Code Review
a9455c8539 Merge change 23861 into eclair
* changes:
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:18:51 -07:00
Cynthia Wong
a7896d2330 am 7a260ba9: Merge change 23824 into eclair
Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp

* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:18:25 -07:00
Android (Google) Code Review
14c76030e3 Merge change 23824 into eclair
* changes:
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:16:57 -07:00
Xia Wang
475539f8ff am 19d6f7ac: Merge change 23750 into eclair
Merge commit '19d6f7ac27448b59c936878756bad49f623a6a99' into eclair-plus-aosp

* commit '19d6f7ac27448b59c936878756bad49f623a6a99':
  Add a test case to measure the power usage of loading a web page
2009-09-03 13:37:05 -07:00
Android (Google) Code Review
a51b3100c1 Merge change 23750 into eclair
* changes:
  Add a test case to measure the power usage of loading a web page
2009-09-03 13:34:58 -07:00
Robert Greenwalt
87869ab6a2 am 1c1ffa0c: Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp

* commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
  Promote MccTable to telephony and use it for both gsm/cdma
2009-09-03 13:05:00 -07:00
Marco Nelissen
2e942021f4 am e1da8be5: Merge change 23835 into eclair
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp

* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
  When encountering a .nomedia file, notify the MediaScannerClient,
2009-09-03 12:29:51 -07:00
Android (Google) Code Review
732e8824bc Merge change 23835 into eclair
* changes:
  When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
2009-09-03 12:27:26 -07:00
Leon Scroggins
3325477e8f am b00fc735: Merge change 23760 into eclair
Merge commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp

* commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
  Attach the title bar to the top of the page.
2009-09-03 11:44:43 -07:00
Android (Google) Code Review
37b2dddd9d Merge change 23760 into eclair
* changes:
  Attach the title bar to the top of the page.
2009-09-03 11:43:06 -07:00
Mike Lockwood
0bdaf0297a am fbd9b87f: Merge change 23807 into eclair
Merge commit 'fbd9b87feab649dc7410711ceaa589e5f058c753' into eclair-plus-aosp

* commit 'fbd9b87feab649dc7410711ceaa589e5f058c753':
  Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
2009-09-03 11:42:21 -07:00
Android (Google) Code Review
476bd504a5 Merge change 23807 into eclair
* changes:
  Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
2009-09-03 11:40:42 -07:00
Daniel Sandler
c8ea6b260f am 704a488e: Merge change 23833 into eclair
Merge commit '704a488ef5f5b50ed82332cbff8d6d982ac09118' into eclair-plus-aosp

* commit '704a488ef5f5b50ed82332cbff8d6d982ac09118':
  New, darker tab widgets for the platform.
2009-09-03 11:25:37 -07:00
Android (Google) Code Review
b907ded9b0 Merge change 23833 into eclair
* changes:
  New, darker tab widgets for the platform.
2009-09-03 11:23:22 -07:00
Mike Reed
8c43a4b98f am 70fc6257: Merge change 23828 into eclair
Merge commit '70fc625745b5c6303951113e6d17ea57870fe2f7' into eclair-plus-aosp

* commit '70fc625745b5c6303951113e6d17ea57870fe2f7':
  allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
2009-09-03 10:48:29 -07:00
Android (Google) Code Review
2610dc7b32 Merge change 23828 into eclair
* changes:
  allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
2009-09-03 10:46:59 -07:00
Andreas Huber
0bac810266 am f6190284: Merge change 23715 into eclair
Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp

* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
  Setting the component role appears to be mandatory now for all mime types.
2009-09-03 09:42:15 -07:00
Andreas Huber
6ffb7de7d4 am 8e65337d: Merge change 23714 into eclair
Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp

* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
  Some work to make audio encoding work.
2009-09-03 09:42:07 -07:00
Android (Google) Code Review
3506d06e85 Merge change 23715 into eclair
* changes:
  Setting the component role appears to be mandatory now for all mime types.
2009-09-03 09:40:17 -07:00
Android (Google) Code Review
300d51c83e Merge change 23714 into eclair
* changes:
  Some work to make audio encoding work.
2009-09-03 09:40:08 -07:00
Libin Tang
b169eb97db am a7d7a86b: Merge change 23818 into eclair
Merge commit 'a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5' into eclair-plus-aosp

* commit 'a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5':
  Exit Emergency Callback Mode if phone process crashes/restarts
2009-09-03 09:37:33 -07:00
Jeff Hamilton
6da5f4b87e am 505cbb44: Merge change 23811 into eclair
Merge commit '505cbb446d46466230c23a09b2ceb201b8faae8f' into eclair-plus-aosp

* commit '505cbb446d46466230c23a09b2ceb201b8faae8f':
  Fix the registration of the package changes broadcast receiver.
2009-09-03 09:36:02 -07:00
Android (Google) Code Review
8608902e91 Merge change 23818 into eclair
* changes:
  Exit Emergency Callback Mode if phone process crashes/restarts
2009-09-03 09:35:25 -07:00
Android (Google) Code Review
23dbf18922 Merge change 23811 into eclair
* changes:
  Fix the registration of the package changes broadcast receiver.
2009-09-03 09:33:44 -07:00
Steve Block
fcd8daa6b9 am b84138c7: Merge change 23806 into eclair
Merge commit 'b84138c72c94f189d4656451097b90f86d751731' into eclair-plus-aosp

* commit 'b84138c72c94f189d4656451097b90f86d751731':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:26:05 -07:00
Android (Google) Code Review
ddfdfdf0aa Merge change 23806 into eclair
* changes:
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:24:15 -07:00
Robert Greenwalt
2d5f16032b am e8f605ff: Merge change 23761 into eclair
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp

* commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9':
  Fix compilation of add-resource tag.
2009-09-03 09:11:10 -07:00
Android (Google) Code Review
981104a567 Merge change 23761 into eclair
* changes:
  Fix compilation of add-resource tag.
2009-09-03 09:08:24 -07:00
Daniel Sandler
1c543035ee am 47cec9fa: Merge change 23817 into eclair
Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp

* commit '47cec9fafbef30b817ac0a8af510ac35e09ea966':
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:51:35 -07:00
Android (Google) Code Review
f1b08e0635 Merge change 23817 into eclair
* changes:
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:49:56 -07:00
Eric Laurent
94b81d85c4 am 1a3af62b: Merge change 23801 into eclair
Merge commit '1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp

* commit '1a3af62bfb3583ac2fece18523927587b6b6a277':
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
2009-09-03 08:02:53 -07:00