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

23101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
76f0ce1fe4 Revert "Merge "Raw types warnings removed."" 
This reverts commit 9794ca60d745757d882d456e653a2dfe41cbb6ff, reversing
changes made to d3f9051c85ffdf50d800b914c8a2def73ffa5bf3.

Change-Id: I39cebc7e92d3604941d66b09bd7b899d06f703fb
 2010-05-03 18:51:28 -07:00
Paul Westbrook
0564f06947 Merge "Fix Gmail unit test" 2010-05-03 16:30:43 -07:00
The Android Open Source Project
8bede19e88 am facad955: am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:28:29 -07:00
The Android Open Source Project
facad955a8 am dcb5f18f: am 007ad770: merge from open-source master 2010-05-03 16:26:53 -07:00
The Android Open Source Project
dcb5f18fd6 am 007ad770: merge from open-source master 
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
 2010-05-03 16:25:15 -07:00
The Android Open Source Project
007ad7700a merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -07:00
Gilles Debunne
9794ca60d7 Merge "Raw types warnings removed." 2010-05-03 16:03:55 -07:00
Paul Westbrook
6d3564e7d6 Fix Gmail unit test 
Fix a NPE where, while running the unit tests, a download
is not found

Change-Id: I7c407112e5cfe7c39ceace25c48c6eba4f5dcfbe
 2010-05-03 15:36:45 -07:00
Erik
d3f9051c85 Merge "Added access fields for second timezone columns." 2010-05-03 13:53:21 -07:00
Vasu Nori
e4dd7cbe5d Merge "sometimes database lock is not held before compiling a statement" 2010-05-03 13:05:06 -07:00
Vasu Nori
9463f297ef sometimes database lock is not held before compiling a statement 
indirectly uncovered by bug:2631971

Change-Id: I71059b6b62bc21612fc98689aefd4534884c8e7c
 2010-05-03 12:24:20 -07:00
Guang Zhu
6c15f6003a improvements on layout test 
* reduce timeout limit from 30s to 15s
* terminate a test case under some condition on uncaught JS exception
* minor fixes

Change-Id: Iabc8f214544d2c8c14139756abc049870023fea5
 2010-05-03 11:49:04 -07:00
Erik
c07b06f12a Added access fields for second timezone columns. 
This adds public access to DTSTART2, DTEND2, and EVENT_TIMEZONE2. These are being used
for work on allDay events.

Change-Id: I5b10eff08e2e61a71bf628ddea70dfb201a5c2b3
 2010-05-03 11:40:35 -07:00
Daniel Lehmann
edd904fd31 Merge "Allow contact-sources to rename the term "All Contacts"" 2010-05-03 09:56:48 -07:00
Jean-Baptiste Queru
0c388fd29c Adapt to new location of libcore 
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
 2010-05-03 09:50:38 -07:00
Jean-Baptiste Queru
c49e010d19 am d84509d5: am 05bcf755: am 2529d4ea: Adapt to new location of libcore 2010-05-02 16:17:23 -07:00
Jean-Baptiste Queru
d84509d55c am 05bcf755: am 2529d4ea: Adapt to new location of libcore 2010-05-02 16:15:26 -07:00
Jean-Baptiste Queru
05bcf7553e am 2529d4ea: Adapt to new location of libcore 
Merge commit '2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken

* commit '2529d4eab80778aef9c7a9fe27712a41686d22c4':
  Adapt to new location of libcore
 2010-05-02 16:11:32 -07:00
Xia Wang
62dd689cae am 011056c2: am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:51:41 -07:00
Xia Wang
011056c2af am 7eb700e0: Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:50:25 -07:00
Xia Wang
7eb700e0df Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken 2010-04-30 15:49:23 -07:00
Jean-Baptiste Queru
44c360831d am 69d5a7ce: am 5b559e81: Adapt to new location of libcore 2010-04-30 15:08:57 -07:00
Mathias Agopian
168f4c0d20 am 8f227c96: am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side 2010-04-30 15:08:40 -07:00
Jean-Baptiste Queru
5dc15b177b am 0d5ad0fb: Merge "Adapt to new location of libcore" into kraken-plus-aosp 2010-04-30 15:08:36 -07:00
Mathias Agopian
b6bac619fc am 1bb8b670: Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 15:08:10 -07:00
Daniel Sandler
83b236c880 am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 15:07:37 -07:00
Dianne Hackborn
47c0c942b0 Fix issue #2555171: Switching to app immediately after unmounting... 
...SD card causes reboot.

Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.

Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
 2010-04-30 14:24:18 -07:00
Daniel Lehmann
88e26c21cc Allow contact-sources to rename the term "All Contacts" 
Bug:2116002
Change-Id: I3609a8c0198dd33c5426a47e14720a4ccd7b8c10
 2010-04-30 13:55:38 -07:00
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore 
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
 2010-04-30 13:23:32 -07:00
Jean-Baptiste Queru
69d5a7cec5 am 5b559e81: Adapt to new location of libcore 2010-04-30 13:20:48 -07:00
Jean-Baptiste Queru
5b559e8168 Adapt to new location of libcore 
Change-Id: Iecb39fdc6d9dc3ceb8a9bb4b3327e05caff0400e
 2010-04-30 13:11:05 -07:00
Mathias Agopian
8f227c96ea am 3b91e13e: make sure the server-side validates pointers/indices visible on the client side 2010-04-30 13:08:41 -07:00
Mathias Agopian
3b91e13ec7 make sure the server-side validates pointers/indices visible on the client side 
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
 2010-04-30 13:05:36 -07:00
Jean-Baptiste Queru
0d5ad0fb19 Merge "Adapt to new location of libcore" into kraken-plus-aosp 2010-04-30 13:05:18 -07:00
Mathias Agopian
1bb8b670f9 Merge "Add support for enqueuing buffers in arbitrary order" into kraken 2010-04-30 12:58:11 -07:00
Jean-Baptiste Queru
52122c60ca Adapt to new location of libcore 
Change-Id: Ie6800e0eb3d5b98e9e1b76e5304df735a0c5a47c
 2010-04-30 12:56:02 -07:00
Jean-Baptiste Queru
8d817f7124 Adapt to new location of libcore 
Change-Id: Ia7046e7f3eace4f31ae48987712b539418d72ed1
 2010-04-30 12:12:00 -07:00
Daniel Sandler
b205dabaa7 am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken

* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
  Tweak style of recent apps dialog title.
 2010-04-30 11:34:03 -07:00
Daniel Sandler
d47cdbb7ea am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp

* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
  Tweak style of recent apps dialog title.
 2010-04-30 11:30:29 -07:00
Xia Wang
fda56b600e Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java 
Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory

bug: 2644009

Change-Id: I1ecc09312f404e00bbf30befffb1811efe578cc3
 2010-04-30 10:59:37 -07:00
Daniel Sandler
3bb5e4d322 Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 10:55:03 -07:00
Daniel Sandler
e6f134ae63 Tweak style of recent apps dialog title. 
Lovingly hand-crafted to UX's specification.

Bug: 2614279
Change-Id: I14a50e80ed4d97e5d14c7a94586380a27c845263
 2010-04-30 13:36:13 -04:00
Scott Main
0f639c7df7 am 5eb01a57: am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:27:15 -07:00
Scott Main
5eb01a57e8 am 27963bbc: am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit '27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken

* commit '27963bbc25278885f57965f6bf8250d6eeabd94a':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:24:25 -07:00
Scott Main
27963bbc25 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:23:10 -07:00
Scott Main
cd8f7bd4e5 Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -07:00
Dianne Hackborn
e48e200fde am 1443fd09: Fix build. 2010-04-29 19:30:45 -07:00
Dianne Hackborn
1443fd096b Fix build. 
Change-Id: I200b8fd7de329133c44fdb66e2bd2b09ab12637d
 2010-04-29 19:26:18 -07:00
Dianne Hackborn
09d91ca47c am fefe7a22: Merge "Fix build." into kraken 2010-04-29 18:01:33 -07:00
Dianne Hackborn
fefe7a225e Merge "Fix build." into kraken 2010-04-29 17:59:17 -07:00