Android (Google) Code Review
999b047cd7
am 3d716ed6: (-s ours) Merge change 9021 into donut
...
Merge commit '3d716ed6a3274cc49dc08029d7ace683b99200ac'
* commit '3d716ed6a3274cc49dc08029d7ace683b99200ac':
DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-30 06:57:14 -07:00
Jean-Baptiste Queru
c684cc45fd
am f4dc9da3: Merge snapshot variant of donut back into the main tree
...
Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'
* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
donut snapshot
2009-07-30 06:57:04 -07:00
Android (Google) Code Review
30335775d3
am 2bad713f: Merge change 8860 into donut
...
Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'
* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
Fix bug 2017664
2009-07-30 06:56:37 -07:00
Wink Saville
4cffc44322
am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
...
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'
* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
2009-07-30 06:56:24 -07:00
Android (Google) Code Review
6c8991186e
Merge change 9098
...
* changes:
CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Android (Google) Code Review
d909f62fd4
Merge change 9090
...
* changes:
Simplify image loading. Use common internal format.
2009-07-29 21:06:23 -07:00
Android (Google) Code Review
8dcdeda608
Merge change 9089
...
* changes:
Filmstrip work and boxed bitmap load bugfixes.
2009-07-29 20:57:02 -07:00
Android (Google) Code Review
b8bbb85bab
Merge change 8974
...
* changes:
Fix OOB in arraycopy.
2009-07-29 18:28:12 -07:00
Android (Google) Code Review
f73072310e
Merge change 9065
...
* changes:
Checkin art assets for film test app and change loading of icons to 8888.
2009-07-29 17:43:05 -07:00
Android (Google) Code Review
1081e63c88
Merge change 9054
...
* changes:
Increase waiting time for data disable action in setPowerStateToDesired().
2009-07-29 17:03:04 -07:00
Android (Google) Code Review
1b08ba865d
am 0869f7ef: Merge change 8962 into donut
...
Merge commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa'
* commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa':
Log uid and package name when launching intents from search
2009-07-29 16:48:40 -07:00
Android (Google) Code Review
6a3890332f
Merge change 9040
...
* changes:
Don't offer to add numbers to the dictionary.
2009-07-29 16:48:34 -07:00
Android (Google) Code Review
60627a2df2
am ad346278: Merge change 8208 into donut
...
Merge commit 'ad346278fe129a341543d4a75bf9cc08c50742f8'
* commit 'ad346278fe129a341543d4a75bf9cc08c50742f8':
Removing MD2
2009-07-29 16:45:22 -07:00
Android (Google) Code Review
f20466a5cb
am 9b91d78a: Merge change 8911 into donut
...
Merge commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8'
* commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8':
Fix issue #1999179 : search -> click result -> press home = search dialog is shown then hidden
2009-07-29 16:45:14 -07:00
Android (Google) Code Review
e5161be750
Merge change 9052
...
* changes:
Less log spew.
2009-07-29 16:43:38 -07:00
Android Git Automerger
061877586c
resolved conflicts for merge of 4d4229e4 to master
2009-07-29 16:42:09 -07:00
Android (Google) Code Review
c1c995628e
Merge change 9021 into donut
...
* changes:
DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-29 14:52:11 -07:00
Android (Google) Code Review
2b1a8b1390
am 67897b1a: (-s ours) Merge change 8884 into donut
...
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'
* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
DO NOT MERGE. Already in master. Fix calendar test.
2009-07-29 14:47:50 -07:00
Android (Google) Code Review
e437ff8099
am 1521cd6e: Merge change 8015 into donut
...
Merge commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead'
* commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead':
Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.
2009-07-29 14:47:41 -07:00
Jean-Baptiste Queru
4a26addf74
Merge snapshot variant of donut back into the main tree
2009-07-29 14:31:38 -07:00
Jean-Baptiste Queru
02f54246f5
donut snapshot
2009-07-29 14:25:07 -07:00
Android (Google) Code Review
e3772efdc5
Merge change 9008
...
* changes:
Only restore the bits for wallpapers that aren't built in.
2009-07-29 14:10:12 -07:00
Android (Google) Code Review
918dca8985
Merge change 9004
...
* changes:
Fix NullPointerException when checking if its a sinkDevice.
2009-07-29 13:57:41 -07:00
Android (Google) Code Review
5f55e83bee
Merge change 9011
...
* changes:
Allow zero-length lists in EventLog entries. (I'm verifying that the consumers of EventLog -- logcat, checkin -- are OK with this.) Improve the error handling in RestoreSession.
2009-07-29 13:23:24 -07:00
Joe Onorato
c1d7a6ec1e
Only restore the bits for wallpapers that aren't built in.
2009-07-29 12:05:36 -07:00
Android (Google) Code Review
4efd8714fb
Merge change 8860 into donut
...
* changes:
Fix bug 2017664 Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention. Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine. Renamed the TextToSpeech.Engine constants that are used as extras for the ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_. Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of "TTS" in the name.
2009-07-29 11:38:44 -07:00
Android (Google) Code Review
7889e33ead
Merge change 8997
...
* changes:
GLESv2 couldn't be loaded due to wrong path specification
2009-07-29 11:11:13 -07:00
Mathias Agopian
574c16f9f8
GLESv2 couldn't be loaded due to wrong path specification
2009-07-29 11:10:29 -07:00
Android (Google) Code Review
033aa3b3d8
Merge change 4768
...
* changes:
Implement sliding window sync.
2009-07-29 10:18:30 -07:00
Android (Google) Code Review
c47c45f02d
Merge change 8987
...
* changes:
Fix firestone build
2009-07-29 09:50:29 -07:00
Marco Nelissen
f4531691b2
Fix firestone build
2009-07-29 09:47:23 -07:00
Android (Google) Code Review
925999d818
am 159e1a9a: Merge change 8883 into donut
...
Merge commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b'
* commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b':
fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN
2009-07-29 09:46:38 -07:00
Android (Google) Code Review
ce2535d8ba
Merge change 8984
...
* changes:
Fix issue 2019031: Volume changes have no effect.
2009-07-29 09:37:14 -07:00
Android (Google) Code Review
5979ff6464
Merge change 8962 into donut
...
* changes:
Log uid and package name when launching intents from search
2009-07-29 08:33:07 -07:00
Android (Google) Code Review
2629eb293d
Merge change 8208 into donut
...
* changes:
Removing MD2
2009-07-29 00:38:53 -07:00
Android (Google) Code Review
05ad423fdd
Merge change 8764
...
* changes:
allow illegal subparam sizes for CDMA SMS
2009-07-28 23:34:11 -07:00
Android (Google) Code Review
389a4a99a4
Merge change 8911 into donut
...
* changes:
Fix issue #1999179 : search -> click result -> press home = search dialog is shown then hidden
2009-07-28 22:08:30 -07:00
Android (Google) Code Review
3edd0030cd
Merge change 8945
...
* changes:
Expose type constants and accessor for unit tests.
2009-07-28 20:46:22 -07:00
Android (Google) Code Review
52eaa311d4
Merge changes 8935,8936
...
* changes:
Fix the IOException in wallpaper restore -- the padding isn't required at the end.
Fix bug 1982892 - batteryservice turns off device even while plugged in
2009-07-28 20:20:02 -07:00
Android (Google) Code Review
34f525c913
Merge change 8931
...
* changes:
fix [1985856] Seg fault when using the soft keyboard in the Messaging app
2009-07-28 19:18:32 -07:00
Mathias Agopian
672136f3e6
fix [1985856] Seg fault when using the soft keyboard in the Messaging app
2009-07-28 19:17:54 -07:00
Android (Google) Code Review
9bd757d14c
Merge change 8757 into donut
...
* changes:
Support x509-user-cert mime type in browser.
2009-07-28 18:34:33 -07:00
Android (Google) Code Review
aa139dbbe7
Merge change 8922
...
* changes:
GPS: Don't call native_set_agps_server() until after we call native_init().
2009-07-28 18:34:28 -07:00
Joe Onorato
1b96719b32
Fix the IOException in wallpaper restore -- the padding isn't required at the end.
2009-07-28 18:30:15 -07:00
Android (Google) Code Review
d4357fec9c
am a62f16ac: Merge change 8877 into donut
...
Merge commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0'
* commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0':
Remove warning in non-eng builds.
2009-07-28 17:57:39 -07:00
Android (Google) Code Review
26348a4a2c
Merge change 8886
...
* changes:
Fix broken calendar tests.
2009-07-28 17:42:53 -07:00
Android (Google) Code Review
c5baba8975
Merge change 8901
...
* changes:
Add new icons and implement text. Fix bug with uploading 8888 bitmaps of non-square size.
2009-07-28 17:22:23 -07:00
Android (Google) Code Review
e5c58c2b93
Merge change 8839
...
* changes:
Fix selection and change icon loading from 565 to 8888.
2009-07-28 17:19:00 -07:00
Android (Google) Code Review
76a4112be6
Merge change 8888
...
* changes:
Voicemail number setting is throwing exception
2009-07-28 16:32:04 -07:00
Android (Google) Code Review
1b35deb3a6
Merge change 8884 into donut
...
* changes:
DO NOT MERGE. Already in master. Fix calendar test.
2009-07-28 16:28:42 -07:00