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

25498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
a7212f555b Merge "Recover a handful of commits that were reverted earlier" 2010-06-21 14:29:47 -07:00
Robert Greenwalt
cacb2cf72c Merge "Reorder ThrottleService startup to avoid race." 2010-06-21 14:12:38 -07:00
Jean-Baptiste Queru
3b9f0a33a1 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
Vasu Nori
05dd626a95 Merge "fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f" 2010-06-21 13:18:00 -07:00
Jean-Baptiste Queru
c1996a16aa Undo previous merge 
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
 2010-06-21 12:37:08 -07:00
Evan Millar
62f4ce67ac am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'

* commit '9afeda0519c4f4892611565d678f01d269863bb8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:12:55 -07:00
Evan Millar
9afeda0519 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:10:55 -07:00
Evan Millar
e47e3f3855 Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 2010-06-21 12:09:40 -07:00
Jean-Baptiste Queru
a6fa26f83f resolved conflicts for merge of 6c9a3004 to master 
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
 2010-06-21 11:44:49 -07:00
Kenny Root
9a76eb568d am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations 
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
 2010-06-21 11:37:10 -07:00
Andrew Stadler
359cf08fb6 Merge "Add getWrappedCursor, and update the JavaDoc." 2010-06-21 11:35:51 -07:00
The Android Open Source Project
6c9a30045b merge from froyo-plus-aosp 
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
 2010-06-21 11:23:45 -07:00
Kenny Root
0fcfa0a53f am f25c560d: am 30cf330f: Import revised translations 
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
 2010-06-21 11:20:28 -07:00
Kenny Root
f25c560dcd am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:17:07 -07:00
Kenny Root
30cf330fae Import revised translations 
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
 2010-06-21 11:03:50 -07:00
Vasu Nori
8208529cd7 Merge "journal_mode should be set only on non-memory databases" 2010-06-21 10:46:29 -07:00
Vasu Nori
194897da94 journal_mode should be set only on non-memory databases 
setting journal_mode to TRUNCATE on memory databases causes an error message
to be displayed by SQLIteDatabase.

Change-Id: Ie8b8ae22cb9fba99cee59dba35b260195c63eadc
 2010-06-21 10:41:14 -07:00
Andrew Stadler
46baf533f5 Add getWrappedCursor, and update the JavaDoc. 
Change-Id: I7d0513056b4d83b457374d783465fe848b7e530c
 2010-06-21 10:23:52 -07:00
Kenny Root
ab8aa51aa6 am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
 2010-06-21 10:16:48 -07:00
Chia-chi Yeh
f23729a0e3 am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 10:16:45 -07:00
Shimeng (Simon) Wang
fedffeedb4 Merge "Add dumpChildFramesAsText function support in LayoutTestController." 2010-06-21 10:07:35 -07:00
Shimeng (Simon) Wang
ad45686d72 Add dumpChildFramesAsText function support in LayoutTestController. 
Change-Id: I8af0bbca1d2166a25486d5a12fb6a985bbe264ef
 2010-06-21 10:05:34 -07:00
Brad Fitzpatrick
9e2b41ca20 am 65ff03a1: am 04b243d0: Fix NPE during ANRs. 
Merge commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0'

* commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0':
  Fix NPE during ANRs.
 2010-06-21 09:54:24 -07:00
Kenny Root
b2ce04c2ea am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
 2010-06-21 09:08:51 -07:00
Chia-chi Yeh
d9e9132eeb am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33' into gingerbread-plus-aosp

* commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 09:08:16 -07:00
Brad Fitzpatrick
65ff03a1fc am 04b243d0: Fix NPE during ANRs. 
Merge commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c' into gingerbread-plus-aosp

* commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c':
  Fix NPE during ANRs.
 2010-06-21 09:05:16 -07:00
Kenny Root
cfe3d205b0 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:02:13 -07:00
Chia-chi Yeh
2ce999fce7 am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread

* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 08:54:19 -07:00
Brad Fitzpatrick
04b243d0f5 Fix NPE during ANRs. 
BUG=2780838

Change-Id: I0d5e9a2323130ca14d1f0df684c8abe4f4dad05a
 2010-06-21 08:01:13 -07:00
Kenny Root
c4e38577f4 Import revised translations 
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
 2010-06-20 18:54:45 -07:00
Chia-chi Yeh
bd240c2737 media: add AudioTrack::getMinFrameCount(). 
Change-Id: If15162583d1d16d89f59be0793106afe77417f35
 2010-06-21 09:51:18 +08:00
Evan Millar
25f3ab4ee7 Manual merge of change 53051 from master (DO NOT MERGE) 
Change-Id: Ia4697a15cb874f25849655994e10aa88ae60b328
 2010-06-18 16:19:26 -07:00
Chia-chi Yeh
535c17a747 Revert "Don't chdir into the keystore directory" 
The same functionality can be achieved by running "stop keystore".
This reverts commit 831c6cc7c1cfcf1271c75dc960948ab6ce720b67.
 2010-06-19 04:44:22 +08:00
Adam Powell
7ade1be822 Action bar button layout changes. 
Theme attribute added for spacing between action buttons. Action
buttons are now allowed to fill up to half of the total action bar's
width.

Change-Id: Iabbc67e695684529dfae9681d4d9580cd30839d0
 2010-06-18 10:12:20 -07:00
Colin Cross
831c6cc7c1 Don't chdir into the keystore directory 
If the keystore daemon chdir's into /data/misc/keystore, /data can
never be unmounted.  During bringup, it's helpful if we can umount
/data and reformat it.

Change-Id: Id5b93ee8a54846fd07e6e0e57bfd0a6fabf603ee
 2010-06-17 22:50:10 -07:00
Daniel Sandler
53f2bb549e am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread 
Merge commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a'

* commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a':
  Fix SDK docs build.
 2010-06-17 19:18:31 -07:00
Daniel Sandler
fddf19f671 am a2650db7: Merge "Fix SDK docs build." into gingerbread 
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp

* commit 'a2650db770e93a9424d6d6948fd31f943f6dac49':
  Fix SDK docs build.
 2010-06-17 19:16:28 -07:00
Daniel Sandler
a2650db770 Merge "Fix SDK docs build." into gingerbread 2010-06-17 19:14:44 -07:00
Daniel Sandler
ae069f76ee Fix SDK docs build. 
Change-Id: I2d11682cdf2cdcd48f0299f8c168fddd5994dc65
 2010-06-17 21:56:26 -04:00
Dianne Hackborn
efd26c6b47 am 3f704e98: am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '3f704e983e36c668a3a13690655ab809666dfc3e'

* commit '3f704e983e36c668a3a13690655ab809666dfc3e':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:55:24 -07:00
Scott Main
0d049e5f62 am 0b16e6a0: am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'

* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:55:19 -07:00
James Dong
8698da75f7 am eaeec4b7: am 2bc48186: am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'

* commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 18:55:13 -07:00
Dianne Hackborn
3f704e983e am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp

* commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:47:28 -07:00
Scott Main
0b16e6a034 am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp

* commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:47:25 -07:00
James Dong
eaeec4b718 am 2bc48186: am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp

* commit '2bc481861ab374f87c12b7bb816ff75ac46147f1':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 18:47:22 -07:00
Dianne Hackborn
801700b1a2 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:43:31 -07:00
Scott Main
7f0a1f62c6 am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:43:13 -07:00
James Dong
2bc481861a am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 18:43:10 -07:00
Jason Sams
a5cb3b87d6 Merge "Remove legacy drawing functions. Skip element names starting with '#'" 2010-06-17 18:06:42 -07:00
Jason Sams
6d1cf4148c Remove legacy drawing functions. 
Skip element names starting with '#'

Change-Id: I6b0967ed1dc47c072c3bed7c0219e2215a7068a6
 2010-06-17 18:05:38 -07:00