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

30258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Hamilton
5410a60261 Merge "Hide this log behind the debug flag." 2010-09-03 13:26:23 -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
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
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
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
Kenny Root
1d5c87b753 am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector 
Merge commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'

* commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
  Fix buffer compacting in NativeDaemonConnector
 2010-09-02 22:32:39 -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
3559d1d1fc am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'

* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
  SipManager: always return true for SIP API and VOIP support query.
 2010-09-02 19:30:16 -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
Wink Saville
bb08caf54b Fix and simplify ConnectivityService singleton. 
Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d
 2010-09-02 19:23:52 -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
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
 2010-09-02 18:53:32 -07:00
James Dong
9f20d3328f am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread 
Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
  Calculate audio media drift time from AudioSource
 2010-09-02 18:51:05 -07: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
Alex Sakhartchouk
caaac0f827 Fixing fragment shader bounding code 
Change-Id: I743dae12bb3f226f758a065d9b353eff36e2f964
 2010-09-02 18:43:24 -07:00