Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
14e5758bc3 Make sure sine: is supported again in stagefright commandline tool. 
Change-Id: I703f1a8b7556543ef71b141dc8e38d8b82d8c6dc
 2010-06-21 13:53:36 -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
Brad Fitzpatrick
27b3a7a759 Start of work on passing around StrictMode policy over Binder calls. 
This is (intendend to be) a no-op change.

At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name.  But nothing is actually
done with them yet.  That value should right now always be 0.

This now boots and seems to work.

Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
 2010-06-21 12:56:35 -07:00
Jean-Baptiste Queru
c1996a16aa Undo previous merge 
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
 2010-06-21 12:37:08 -07:00
Robert Greenwalt
1d15dd7d27 Don't modify a list while iterating. 
Remember who we want to remove instead.  Fixes concurrent modification
exception.

bug:2778958
Change-Id: If8827955e6a716fe39cc31fe5a092c613a6786d4
 2010-06-21 12:15:26 -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
584bd35aba am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:16:25 -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
e364122555 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:15:29 -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
Ben Murdoch
c530f36003 Web runtime 
- link following with simple SOP check
 - back button
 - fullscreen (title shown as toast for now)

Change-Id: I6c64dd87b2f216f02a1d0ee4e7e5d51067ca80ee
 2010-06-21 12:18:17 +01: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
James Dong
49b6fbaebd AmrInputStream refresh: eliminate the dependency upon OpenCore's code 
Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
 2010-06-18 18:56:54 -07: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
Jason Sams
94d0759987 Fountain example cleanup. 
Remove compatability versions of rsg functions that took old 'i' types.

Change-Id: Icea268a37df5e212237299e094ba26c6f76468d7
 2010-06-18 15:52:30 -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 831c6cc7c1.
 2010-06-19 04:44:22 +08:00
The Android Open Source Project
f1f33c4eb2 merge from open-source master 
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
 2010-06-18 12:46:16 -07:00
The Android Open Source Project
766d1b7458 merge from open-source master 
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
 2010-06-18 12:44:20 -07:00
The Android Open Source Project
e5a023bfbb merge from open-source master 
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
 2010-06-18 12:40:42 -07:00
The Android Open Source Project
d398e7a493 merge from open-source master 
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
 2010-06-18 11:36:35 -07: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
Dianne Hackborn
299e5cfa3d Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Modify UIModeManager to not get location updates every thirty minutes.
Instead it gets one once a day, and requests a new update when airplane
mode is turned off or the time zone changes.

Change-Id: I8044c27b5cd77709e4b872e2e8edd352f23e4af1
 2010-06-17 19:20:13 -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