OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge in master-release history after reset to master
2013-05-06
Marco Nelissen
am 3755dbec: am 3d3cc6e1: Merge "Report actual disk...
commit
|
commitdiff
|
tree
2013-05-06
Marco Nelissen
am 3d3cc6e1: Merge "Report actual disk space used"...
commit
|
commitdiff
|
tree
2013-05-05
Marco Nelissen
Merge "Report actual disk space used" into jb-mr2-dev
commit
|
commitdiff
|
tree
2013-05-01
Marco Nelissen
Report actual disk space used
commit
|
commitdiff
|
tree
2013-01-29
Marco Nelissen
Merge "Add new format constant"
commit
|
commitdiff
|
tree
2013-01-17
Marco Nelissen
Add new format constant
commit
|
commitdiff
|
tree
2012-12-17
Marco Nelissen
Merge "Add NULL check to CallStack::toString"
commit
|
commitdiff
|
tree
2012-12-17
Marco Nelissen
Add NULL check to CallStack::toString
commit
|
commitdiff
|
tree
2012-02-22
Marco Nelissen
Merge "Eliminate scanner file cache"
commit
|
commitdiff
|
tree
2012-02-13
Marco Nelissen
am 2e0f6715: Merge "Further optimize media scanner."
commit
|
commitdiff
|
tree
2012-02-13
Marco Nelissen
Merge "Further optimize media scanner."
commit
|
commitdiff
|
tree
2012-02-10
Marco Nelissen
am c62242a5: Merge "Fix "dumpsys activity provider""
commit
|
commitdiff
|
tree
2012-02-10
Marco Nelissen
Merge "Fix "dumpsys activity provider""
commit
|
commitdiff
|
tree
2012-02-08
Marco Nelissen
am b3f04a65: Merge "Delete entries in bulk"
commit
|
commitdiff
|
tree
2012-02-08
Marco Nelissen
Merge "Delete entries in bulk"
commit
|
commitdiff
|
tree
2012-02-07
Marco Nelissen
am f047c14f: Merge "Make media scanner use new delete...
commit
|
commitdiff
|
tree
2012-02-07
Marco Nelissen
Merge "Make media scanner use new delete-parameter"
commit
|
commitdiff
|
tree
2012-02-02
Marco Nelissen
am 8ca8a69d: Merge "Enable media scanner bulk inserts"
commit
|
commitdiff
|
tree
2012-02-02
Marco Nelissen
Merge "Enable media scanner bulk inserts"
commit
|
commitdiff
|
tree
2012-01-30
Marco Nelissen
am f3a3b9ec: Merge "Handle adding/removing/renaming...
commit
|
commitdiff
|
tree
2012-01-30
Marco Nelissen
Merge "Handle adding/removing/renaming nomedia paths"
commit
|
commitdiff
|
tree
2012-01-12
Marco Nelissen
am 3fbc0b20: Merge "MediaScanner: Disable bulk insert...
commit
|
commitdiff
|
tree
2012-01-12
Marco Nelissen
Merge "MediaScanner: Disable bulk insert for settings"
commit
|
commitdiff
|
tree
2012-01-07
Marco Nelissen
am 2ef4b663: Merge "New UX calls for dialogs without...
commit
|
commitdiff
|
tree
2012-01-07
Marco Nelissen
Merge "New UX calls for dialogs without titles."
commit
|
commitdiff
|
tree
2012-01-06
Marco Nelissen
am 18c6afa0: Merge "Also accept non-parenthesized genre...
commit
|
commitdiff
|
tree
2012-01-06
Marco Nelissen
Merge "Also accept non-parenthesized genre numbers"
commit
|
commitdiff
|
tree
2012-01-05
Marco Nelissen
am 4b4d00e7: Merge "ThumbnailUtils: To fix misuse of...
commit
|
commitdiff
|
tree
2012-01-05
Marco Nelissen
Merge "ThumbnailUtils: To fix misuse of FileInputStream."
commit
|
commitdiff
|
tree
2011-12-15
Marco Nelissen
am 24ef465d: Merge "Add ContentProvider.dump()"
commit
|
commitdiff
|
tree
2011-12-15
Marco Nelissen
Merge "Add ContentProvider.dump()"
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
am 240941cd: am a1cd09e0: am 7ff7821a: am d4b22ab4...
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t !=...
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
am 7ff7821a: am d4b22ab4: status_t != bool
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
am d4b22ab4: status_t != bool
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
am 02b370f1: Merge "status_t != bool"
commit
|
commitdiff
|
tree
2011-11-18
Marco Nelissen
Merge "status_t != bool"
commit
|
commitdiff
|
tree
2011-11-17
Marco Nelissen
am 5a1623b3: am 3de68918: am e937da83: Merge "Change...
commit
|
commitdiff
|
tree
2011-11-17
Marco Nelissen
am 3de68918: am e937da83: Merge "Change MediaController...
commit
|
commitdiff
|
tree
2011-11-16
Marco Nelissen
am e937da83: Merge "Change MediaController look b/5584613...
commit
|
commitdiff
|
tree
2011-11-16
Marco Nelissen
Merge "Change MediaController look b/5584613" into...
commit
|
commitdiff
|
tree
2011-11-03
Marco Nelissen
am a4e702c2: am f51f1bd9: Verify we actually have valid...
commit
|
commitdiff
|
tree
2011-11-03
Marco Nelissen
am f51f1bd9: Verify we actually have valid utf8 metadata
commit
|
commitdiff
|
tree
2011-10-31
Marco Nelissen
am 6d4b9f0b: Merge "Make MediaController use low profile...
commit
|
commitdiff
|
tree
2011-10-31
Marco Nelissen
Merge "Make MediaController use low profile system...
commit
|
commitdiff
|
tree
2011-10-19
Marco Nelissen
Merge "Refactor FileInserter in MediaScanner and adding...
commit
|
commitdiff
|
tree
2011-10-10
Marco Nelissen
am 803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
commit
|
commitdiff
|
tree
2011-09-30
Marco Nelissen
Merge "Remove Ringtone.setWakeMode, it's not needed."
commit
|
commitdiff
|
tree
2011-09-29
Marco Nelissen
Merge "Use SoundPool instead of Ringtone."
commit
|
commitdiff
|
tree
2011-09-29
Marco Nelissen
Merge "Release MediaPlayer before letting it go out...
commit
|
commitdiff
|
tree
2011-09-28
Marco Nelissen
Merge "Log a warning when a MediaPlayer is finalized...
commit
|
commitdiff
|
tree
2011-09-21
Marco Nelissen
Merge "MediaScanner: To query row ids of music files...
commit
|
commitdiff
|
tree
2011-09-09
Marco Nelissen
Merge "Fix bug 5045498 Unhide Remote Control Client...
commit
|
commitdiff
|
tree
2011-09-07
Marco Nelissen
Merge "Fix startBluetoothSco race"
commit
|
commitdiff
|
tree
2011-08-12
Marco Nelissen
Merge "Don't remove effects on session 0"
commit
|
commitdiff
|
tree
2011-08-11
Marco Nelissen
Merge "Only set the ringtones and such if this is the...
commit
|
commitdiff
|
tree
2011-08-11
Marco Nelissen
Merge "Add Bluetooth SCO test app"
commit
|
commitdiff
|
tree
2011-08-10
Marco Nelissen
Merge "Check pids instead of IBinders"
commit
|
commitdiff
|
tree
2011-08-09
Marco Nelissen
Merge "Keep effects sessions active when the caller...
commit
|
commitdiff
|
tree
2011-06-15
Marco Nelissen
am 9c3c3004: am d8f9a83c: resolved conflicts for merge...
commit
|
commitdiff
|
tree
2011-06-15
Marco Nelissen
am d8f9a83c: resolved conflicts for merge of d027329c...
commit
|
commitdiff
|
tree
2011-06-15
Marco Nelissen
resolved conflicts for merge of d027329c to gingerbread...
commit
|
commitdiff
|
tree
2011-06-10
Marco Nelissen
am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we...
commit
|
commitdiff
|
tree
2011-06-09
Marco Nelissen
am 90dc22fa: am a02d9bf9: Make sure we don\'t read...
commit
|
commitdiff
|
tree
2011-06-09
Marco Nelissen
am a02d9bf9: Make sure we don\'t read from invalid fds
commit
|
commitdiff
|
tree
2011-06-06
Marco Nelissen
Merge "resolved conflicts for merge of b2fd84ad to...
commit
|
commitdiff
|
tree
2011-06-06
Marco Nelissen
resolved conflicts for merge of b2fd84ad to master
commit
|
commitdiff
|
tree
2011-06-06
Marco Nelissen
resolved conflicts for merge of b9783b49 to honeycomb...
commit
|
commitdiff
|
tree
2011-06-06
Marco Nelissen
Merge "Add WebP Mime-Type support in Android Media...
commit
|
commitdiff
|
tree
2011-05-31
Marco Nelissen
Merge "Fix crash when nesting Picture recording."
commit
|
commitdiff
|
tree
2011-05-09
Marco Nelissen
Merge "Fix mode."
commit
|
commitdiff
|
tree
2011-05-09
Marco Nelissen
Merge "When using O_CREAT, the mode should be specified."
commit
|
commitdiff
|
tree
2011-05-06
Marco Nelissen
Merge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART"
commit
|
commitdiff
|
tree
2011-05-04
Marco Nelissen
am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix...
commit
|
commitdiff
|
tree
2011-05-04
Marco Nelissen
am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
commit
|
commitdiff
|
tree
2011-04-26
Marco Nelissen
Merge "Fix javadoc."
commit
|
commitdiff
|
tree
2011-04-19
Marco Nelissen
Merge "Fix bugs in ListView"
commit
|
commitdiff
|
tree
2011-03-29
Marco Nelissen
Merge "Fix media scanner uri handling."
commit
|
commitdiff
|
tree
2011-02-10
Marco Nelissen
Merge "Better genre support."
commit
|
commitdiff
|
tree
2011-02-03
Marco Nelissen
Merge "Add a convenience method for getting the media...
commit
|
commitdiff
|
tree
2011-01-29
Marco Nelissen
am c929677e: Merge "Increase the number of useful bits...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
am f13d4501: (-s ours) Send "compilation" tag when...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
am ba77a3f9: (-s ours) Add support for the "compilation...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
am 8952df72: am 4b440268: am c929677e: Merge "Increase...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
am 4b440268: am c929677e: Merge "Increase the number...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
am c929677e: Merge "Increase the number of useful bits...
commit
|
commitdiff
|
tree
2011-01-25
Marco Nelissen
Merge "Increase the number of useful bits in the spectrum...
commit
|
commitdiff
|
tree
2011-01-14
Marco Nelissen
am ae0c56c7: am 3506d885: Merge "Fix issue with notification...
commit
|
commitdiff
|
tree
2011-01-14
Marco Nelissen
am 3506d885: Merge "Fix issue with notification layouts...
commit
|
commitdiff
|
tree
2011-01-14
Marco Nelissen
Merge "Fix issue with notification layouts." into honeycomb
commit
|
commitdiff
|
tree
2011-01-13
Marco Nelissen
am d6129b79: (-s ours) am f679ba7d: Cherrypick from...
commit
|
commitdiff
|
tree
2011-01-13
Marco Nelissen
am f679ba7d: Cherrypick from GB. Do Not Merge.
commit
|
commitdiff
|
tree
2011-01-12
Marco Nelissen
am 18aa2da2: am a8a656b0: Fix scanning of modified...
commit
|
commitdiff
|
tree
2011-01-12
Marco Nelissen
am a8a656b0: Fix scanning of modified files.
commit
|
commitdiff
|
tree
2011-01-11
Marco Nelissen
am 9356e609: am 2888208b: am f13d4501: Send "compilation...
commit
|
commitdiff
|
tree
2011-01-11
Marco Nelissen
am f61caad0: am d1da80a4: am ba77a3f9: Add support...
commit
|
commitdiff
|
tree
2011-01-11
Marco Nelissen
am 2888208b: am f13d4501: Send "compilation" tag when...
commit
|
commitdiff
|
tree
2011-01-11
Marco Nelissen
am d1da80a4: am ba77a3f9: Add support for the "compilation...
commit
|
commitdiff
|
tree
2011-01-07
Marco Nelissen
am af5473ee: Merge "Add support for the "compilation...
commit
|
commitdiff
|
tree
2011-01-07
Marco Nelissen
Merge "Add support for the "compilation" tag in mp3...
commit
|
commitdiff
|
tree
next