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

30375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
004abb1223 resolved conflicts for merge of 3d7d3690 to master 
Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf
 2010-09-03 14:07:25 -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
Scott Main
8ae409f501 am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error 
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error
 2010-09-03 13:28:18 -07:00
Brad Fitzpatrick
4f3c5589c8 am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'

* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 13:27:51 -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
Jeff Hamilton
5410a60261 Merge "Hide this log behind the debug flag." 2010-09-03 13:26:23 -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
Wink Saville
02bbbc14ef Merge "Remove unused intent from filter and unused method." 2010-09-03 13:17:00 -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
Jeff Hamilton
2c2d72a7fd Hide this log behind the debug flag. 
Change-Id: I83eb8558c8037f3b703dcf46c2d3aa0fa3d18a43
 2010-09-03 15:10:28 -05:00
Alex Sakhartchouk
355383e424 Merge "Fixing fragment shader bounding code" 2010-09-03 12:58:28 -07:00
Daniel Sandler
78e42751f3 Merge "Don't get stung!" 2010-09-03 12:51:36 -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
Chet Haase
52d33aa412 Merge "Add transition effects for layout changes on ViewGroups" 2010-09-03 12:31:17 -07:00
Chet Haase
21cd1389d2 Add transition effects for layout changes on ViewGroups 
Change-Id: Ibefcca5692450188fbcec608f3f7e36be1213b21
 2010-09-03 12:20:00 -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
462bac9222 am e7884d68: am d85621c9: Don\'t crash when extra logging is enabled. 
Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a'

* commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a':
  Don't crash when extra logging is enabled.
 2010-09-03 11:54:31 -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
Daniel Sandler
44434f002a Don't get stung! 
Change-Id: I8211675e619bcc31c991296387513d07ad53ff10
 2010-09-03 14:45:45 -04:00
Daniel Sandler
b062f02d54 Merge "Fix status bar battery meter." 2010-09-03 11:41:43 -07:00
James Dong
9b3569bc42 am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer 
Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'

* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
  Remove unused/debugging code from MP4 file writer
 2010-09-03 11:37:14 -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
Daniel Sandler
3df3ad3faa Fix status bar battery meter. 
Bug: 2974927
Change-Id: I22bcf92a85bca3c2c2d1d2efd2a501e563b3c84c
 2010-09-03 14:28:02 -04: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
Gloria Wang
048350abfe Fix for the incorrect size of the new added DRM file. (bug 2897238) 
Change-Id: I798be5243116727abdc77850000a6a84ab204bd6
 2010-09-03 10:45:51 -07:00
Wink Saville
30bf654574 Remove unused intent from filter and unused method. 
Change-Id: I8c503903fceb508658cce14918f2c77c04289873
 2010-09-03 10:28:57 -07:00
Daniel Sandler
2af574d815 Merge "Tweaks to lights out animation." 2010-09-03 10:13:55 -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
0e60f5304b am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread 
Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d'

* commit '3c3fc97e104bd17af608727d82e965fc28f2c89d':
  Better file size estimate
 2010-09-03 09:59:05 -07:00
Kenny Root
4d42bdec82 am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold 
Merge commit '0eec8948f89c5216464d8204cadd69d7a6ec3669'

* commit '0eec8948f89c5216464d8204cadd69d7a6ec3669':
  Decrease PackageManagerService wait time for vold
 2010-09-03 09:58:51 -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
Maksymilian Osowski
94cba5b2a2 Merge "Fixed the run_apache2.py script to use the correct mime.types file." 2010-09-03 09:49:51 -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
Maksymilian Osowski
5846d4561d Fixed the run_apache2.py script to use the correct mime.types file. 
Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210
 2010-09-03 17:03:33 +01:00
Leon Scroggins III
e742c08ce0 Use the proper selection when performing a delete. 
Bug: 2956964

Change-Id: I488c291b2fb3cfa5c5d510bd4a03afbc8949d8d8
 2010-09-03 11:45:28 -04:00
Wink Saville
de7fb55369 Merge "Fix and simplify ConnectivityService singleton." 2010-09-03 08:16:30 -07:00
Bjorn Bringert
c4b0598239 Merge "Test for decoding Bitmap from MemoryFile ParcelFileDescriptor" 2010-09-03 02:27:05 -07:00