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

26415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
d6fd133d18 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread 
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
 2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93 Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Dianne Hackborn
acc4e041d2 am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready. 
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp

* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
  DO NOT MERGE.  Some stuff that is Not Ready.
 2010-09-03 15:23:46 -07:00
Dianne Hackborn
69717ccd13 DO NOT MERGE. Some stuff that is Not Ready. 
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
 2010-09-03 15:20:06 -07:00
Dianne Hackborn
6a3ffb5bee am df3a0f50: Merge "Improve doc." into gingerbread 
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
 2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3 Merge "Improve doc." into gingerbread 2010-09-03 15:15:50 -07:00
Dianne Hackborn
170bae7d83 Improve doc. 
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
 2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388 am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
 2010-09-03 15:10:24 -07:00
Dianne Hackborn
e1aa82a422 Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread 2010-09-03 15:07:17 -07:00
Andreas Huber
8e11c82247 am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting. 
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp

* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
  Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
 2010-09-03 14:50:18 -07:00
Dan Morrill
6993d3d136 Adding a feature denoting support for 5 or more fully 
independent multitouch pointers.

Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
 2010-09-03 14:41:36 -07:00
Andreas Huber
9fee0b2a02 Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting. 
Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
 2010-09-03 14:31:50 -07:00
John Wang
419126a696 am dc243482: Merge "Add API to get all foreground calls." into gingerbread 
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp

* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
  Add API to get all foreground calls.
 2010-09-03 14:08:32 -07:00
John Wang
dc243482d6 Merge "Add API to get all foreground calls." into gingerbread 2010-09-03 14:06:20 -07:00
Adam Powell
f9a1ff4173 am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp

* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
 2010-09-03 14:00:41 -07:00
Adam Powell
e7c02ef40a Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread 2010-09-03 13:58:37 -07:00
Andreas Huber
af7a7c34e0 am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp

* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
  Properly buffer a certain amount of data on streaming sources before finishing prepare().
 2010-09-03 13:48:43 -07:00
Andreas Huber
cc4a38c60f Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 2010-09-03 13:46:02 -07:00
Andreas Huber
87ab9cdd0f Properly buffer a certain amount of data on streaming sources before finishing prepare(). 
Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
 2010-09-03 13:44:42 -07:00
Dianne Hackborn
3d7d3690de am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp

* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
  These are not ready to be exposed.  Also rename them to be better.
 2010-09-03 13:26:30 -07:00
Dianne Hackborn
e25b4bc76f Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread 2010-09-03 13:24:33 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error 
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
 2010-09-03 13:18:28 -07:00
Scott Main
2b136832be am c4367e54: fix code snippet error 
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread

* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
  fix code snippet error
 2010-09-03 13:15:11 -07:00
Dianne Hackborn
482566ed5c These are not ready to be exposed. Also rename them to be better. 
Change-Id: I7c234144497084b7769f8c46761b7d74d1c583d5
 2010-09-03 12:51:28 -07:00
Brad Fitzpatrick
9eb32c96c8 am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 12:49:44 -07:00
Brad Fitzpatrick
a2f2141c84 Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 2010-09-03 12:46:25 -07:00
Adam Powell
e6ffce9f65 Fix bug 2973252 - Make overscroll glow respect ifContentScrolls 
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
 2010-09-03 12:06:51 -07:00
James Dong
3caa71483f Not all audio source has the drift time information 
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
 2010-09-03 12:01:55 -07:00
Marco Nelissen
e7884d68a6 am d85621c9: Don\'t crash when extra logging is enabled. 
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp

* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
  Don't crash when extra logging is enabled.
 2010-09-03 11:51:28 -07:00
Marco Nelissen
d85621c938 Don't crash when extra logging is enabled. 
Change-Id: I76cf8db0f51ed33e91acee9636180e8d7c0b5ff9
 2010-09-03 11:46:19 -07:00
James Dong
bc1452a307 am 7755cdd6: Remove unused/debugging code from MP4 file writer 
Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp

* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
  Remove unused/debugging code from MP4 file writer
 2010-09-03 11:33:47 -07:00
Brad Fitzpatrick
fa8e271636 More SharedPreferences commit() -> apply() changes. 
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
 2010-09-03 11:18:28 -07:00
Scott Main
c4367e54e4 fix code snippet error 
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
 2010-09-03 11:03:42 -07:00
James Dong
7755cdd696 Remove unused/debugging code from MP4 file writer 
o also makes nal length in the recorded file modifiable at runtime

Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
 2010-09-03 10:13:19 -07:00
James Dong
3c3fc97e10 am 46e63b34: Merge "Better file size estimate" into gingerbread 
Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
  Better file size estimate
 2010-09-03 09:55:38 -07:00
Kenny Root
0eec8948f8 am 305bcbf0: Decrease PackageManagerService wait time for vold 
Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp

* commit '305bcbf0c961840c4505770d084a1caacc074dbb':
  Decrease PackageManagerService wait time for vold
 2010-09-03 09:55:33 -07:00
James Dong
46e63b3467 Merge "Better file size estimate" into gingerbread 2010-09-03 09:53:13 -07:00
Kenny Root
305bcbf0c9 Decrease PackageManagerService wait time for vold 
Up the blocking queue maximum to twice the number of containers we
allow which should let "asec list" complete without blocking the thread
several times.

Change the threads for the NativeDaemonConnector to vold and netd to be
more descriptive instead of the same name.

Bug: 2501075
Change-Id: I7e7949845a6c70a3d619aec0fa79ceef3c17a4be
 2010-09-03 09:33:34 -07:00
Kenny Root
fb79b7dab3 am 12da9d74: Fix buffer compacting in NativeDaemonConnector 
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp

* commit '12da9d7472ae87b841575d5358e19f143d12f900':
  Fix buffer compacting in NativeDaemonConnector
 2010-09-02 22:29:05 -07:00
Kenny Root
12da9d7472 Fix buffer compacting in NativeDaemonConnector 
The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.

Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
 2010-09-02 22:24:06 -07:00
James Dong
cb7e65c6cb Better file size estimate 
When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.

Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
 2010-09-02 20:10:00 -07:00
Hung-ying Tyan
ea16e72bff am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 
Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp

* commit 'b355714a2995ebe343808e06f69da5067f52a833':
  SipManager: always return true for SIP API and VOIP support query.
 2010-09-02 19:26:56 -07:00
Hung-ying Tyan
b355714a29 Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 2010-09-02 19:23:31 -07:00
Hung-ying Tyan
643fce9781 SipManager: always return true for SIP API and VOIP support query. 
Change-Id: I397a804e0aa598aee77a8ce28ada1b11e10fbaea
http://b/issue?id=2972054
 2010-09-03 10:19:23 +08:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
 2010-09-02 18:44:11 -07:00
James Dong
bb64e554d9 am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread 
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource
 2010-09-02 18:41:49 -07:00
Scott Main
3208557edc am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread

* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
  clarify dp dimension description
 2010-09-02 18:30:16 -07:00
James Dong
7ed7668b30 Merge "Calculate audio media drift time from AudioSource" into gingerbread 2010-09-02 18:24:21 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Dianne Hackborn
31103928ed am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread 
Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp

* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
  Implement #2964234: Add support for <uses-package> element to aapt
 2010-09-02 17:36:37 -07:00