ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,994 Commits 2 Branches 0 Tags 54 MiB
0143f6b61d
Commit Graph

19994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
0143f6b61d Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster." 2010-08-26 15:20:31 -07:00
Gilles Debunne
7e3f56abd8 Merge "resolved conflicts for merge of f309c7a8 to master" 2010-08-26 15:07:27 -07:00
Gilles Debunne
96ed8973b9 resolved conflicts for merge of f309c7a8 to master 
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
 2010-08-26 14:48:48 -07:00
Irfan Sheriff
830227f9b8 Merge "Add WifiStateMachine details for dump" 2010-08-26 14:43:49 -07:00
Jim Miller
e6b86d0c79 Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
39c1357f8d Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00
Guang Zhu
5b6547cde9 am fe8eaf3b: am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c'

* commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 13:15:29 -07:00
Dianne Hackborn
cde9a8ab24 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 13:15:21 -07:00
Eric Laurent
e071349af8 am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
  Added automated tests for reverb audio effect.
 2010-08-26 13:15:09 -07:00
James Dong
6187f4c307 am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 13:15:00 -07:00
Banavathu, Srinivas Naik
132a019214 am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 13:14:49 -07:00
Robert Greenwalt
dd3b909c7a am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'

* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
  Add an API to request route to an IPv6 host.
 2010-08-26 13:14:17 -07:00
Shimeng (Simon) Wang
b24337953c Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Gilles Debunne
198d280985 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread 
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
 2010-08-26 11:01:34 -07:00
Gilles Debunne
26c7992743 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Guang Zhu
8e7d6be788 am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 10:52:27 -07:00
Dianne Hackborn
015125608b am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Guang Zhu
0d6c2a6f01 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
3d66e77ef3 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Eric Laurent
4fb3a6e0f1 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
 2010-08-26 10:19:23 -07:00
Eric Laurent
66f0eb4c10 Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
e1d522cc10 am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 09:53:30 -07:00
James Dong
e4295dc132 Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Maksymilian Osowski
e5376223c9 Merge "Tweaked the logging + some minor style fixes." 2010-08-26 09:12:09 -07:00
Banavathu, Srinivas Naik
07048a6c5d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 09:02:33 -07:00
Robert Greenwalt
39729d08a2 Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Maksymilian Osowski
5ab48d53a3 Merge "Updated the script to include access log." 2010-08-26 08:01:58 -07:00
satok
4de0e77490 am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6'

* commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:08:55 -07:00
satok
4b1d46ad79 am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:01:28 -07:00
Maksymilian Osowski
a7c533dc9f Merge "Added forwarding service." 2010-08-26 06:21:58 -07:00
Chung-yih Wang
2853a5fcf8 am cfc3e71e: am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702'

* commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:26:47 -07:00
Chung-yih Wang
3f39a07a7d am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit '0858806ffcb9ff34725abb79106aa1de27d1bf60' into gingerbread-plus-aosp

* commit '0858806ffcb9ff34725abb79106aa1de27d1bf60':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:24:17 -07:00
Dianne Hackborn
17cf0e5ff1 resolved conflicts for merge of 66d633d2 to master 
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
 2010-08-25 23:14:44 -07:00
Dianne Hackborn
f89bba4d74 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread 
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
 2010-08-25 22:02:18 -07:00
Dianne Hackborn
a79061a3e4 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Chia-chi Yeh
0b70da2cb3 am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 
Merge commit '91fe746437e1709b83b4eb4d113e5f435d7c6412'

* commit '91fe746437e1709b83b4eb4d113e5f435d7c6412':
  Revert "RTP: integrate the echo canceller from speex."
 2010-08-25 20:02:04 -07:00
Hung-ying Tyan
f29dcb9ca5 am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1'

* commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 20:02:00 -07:00
Chia-chi Yeh
82d6e71fad am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 
Merge commit '14e00621c81da6a0391da47afce77945b27c7231' into gingerbread-plus-aosp

* commit '14e00621c81da6a0391da47afce77945b27c7231':
  Revert "RTP: integrate the echo canceller from speex."
 2010-08-25 19:46:04 -07:00
Chia-chi Yeh
3898d53baa Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 2010-08-25 19:43:58 -07:00
Hung-ying Tyan
7a2b14a682 am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp

* commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 19:30:03 -07:00
Chung-yih Wang
319741d31b am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'

* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
  Add dynamic uid info for tracking the sip service usage.
 2010-08-25 19:28:45 -07:00
Hung-ying Tyan
c369e4f46c Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 2010-08-25 19:27:50 -07:00
Chung-yih Wang
cf1475b007 am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp

* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
  Add dynamic uid info for tracking the sip service usage.
 2010-08-25 19:26:31 -07:00
Chung-yih Wang
bf1f8696d7 Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 2010-08-25 19:25:02 -07:00
Irfan Sheriff
27b09d51fb Merge "fix connectNetwork corner cases" 2010-08-25 18:23:47 -07:00
Daniel Sandler
cf804088af Merge "System bar improvements." 2010-08-25 18:22:35 -07:00
Robert Greenwalt
ab9cd1f875 resolved conflicts for merge of b998f311 to gingerbread-plus-aosp 
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
 2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
ed380dff91 am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:41:02 -07:00
Chet Haase
9edfe7251a Merge "Fix for end events from Sequencer objects" 2010-08-25 17:40:30 -07:00
Konstantin Lopyrev
f8a7953ff8 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:37:45 -07:00