Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,054 Commits 3 Branches 0 Tags
d0faf5a2dd892228bbfbf1e43aba95f60c6bca05
Commit Graph

26054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
d0faf5a2dd am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
 2010-08-26 11:04:01 -07:00
Gilles Debunne
f309c7a869 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
Eric Laurent
c6d7a8953d Merge "Changed type of reverb presets from int to short" into gingerbread 2010-08-26 11:01:06 -07:00
Gilles Debunne
1b400c7763 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Guang Zhu
fe8eaf3b5d 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
efd05ea69a 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
1c04500378 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Eric Laurent
71450f8139 Changed type of reverb presets from int to short 
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.

Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
 2010-08-26 10:42:38 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup 
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
 2010-08-26 10:20:01 -07:00
Eric Laurent
2db7330578 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
dfded35b3a Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
9509a0ce7e 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
318a759e3c Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Eric Laurent
391e2d0d88 Added automated tests for reverb audio effect. 
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.

Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
 2010-08-26 09:42:49 -07:00
Banavathu, Srinivas Naik
eb182d789d 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
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
satok
15edaceb2d 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
satok
913a8925c0 DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Change-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba
 2010-08-26 22:53:07 +09:00
Chung-yih Wang
cfc3e71eae 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
Chung-yih Wang
0858806ffc Add Wifi High Perf. mode during a call. 
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.

Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
 2010-08-26 15:05:48 +08:00
Dianne Hackborn
66d633d208 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
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context. 
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
 2010-08-25 21:50:54 -07:00
Chia-chi Yeh
91fe746437 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
14e00621c8 Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 2010-08-25 19:43:58 -07:00
Chia-chi Yeh
7fa7ee11f6 Revert "RTP: integrate the echo canceller from speex." 
This reverts commit 4ae6ec428f.
 2010-08-26 10:33:09 +08:00
Hung-ying Tyan
d06e641dbf 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
Hung-ying Tyan
108a06c9fc Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 2010-08-25 19:27:50 -07:00
Chung-yih Wang
5e0d833710 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
ea52d35e56 Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 2010-08-25 19:25:02 -07:00
Gilles Debunne
df4ee43062 Fix for NPE in TextView. 
Bug http://b/issue?id=2941549

Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
 2010-08-25 19:15:10 -07:00
Chung-yih Wang
5424c8dcac Add dynamic uid info for tracking the sip service usage. 
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
 2010-08-26 10:12:05 +08:00
Guang Zhu
b5c4caa078 add mouse up/down/click support in DumpRenderTree 
use touchStart/End when mouseDown/Up is called in current
EventSender implmentation.

Change-Id: Iff3e7f45b6a7170d9be1c7ec9b12a74a74737732
 2010-08-25 17:54:43 -07:00
Robert Greenwalt
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp 
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
 2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
5a54e98022 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
Konstantin Lopyrev
6947cc5942 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 2010-08-25 17:35:50 -07:00
Romain Guy
d72c1172f6 am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread 
Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp

* commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
  reserve android.opengl.GLWallpaperService name for future use
 2010-08-25 17:28:50 -07:00
Romain Guy
0c490839b2 Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread 2010-08-25 17:26:20 -07:00
Kenny Root
eb0e0f4651 am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread 
Merge commit '2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp

* commit '2e7427f39ec15dcb43cc1247372b53980be11d38':
  Add LFH offset to verbose list of APK
 2010-08-25 17:22:01 -07:00
Kenny Root
2e7427f39e Merge "Add LFH offset to verbose list of APK" into gingerbread 2010-08-25 17:20:29 -07:00
Mathias Agopian
f45b674d48 reserve android.opengl.GLWallpaperService name for future use 
Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
 2010-08-25 16:57:02 -07:00
Dianne Hackborn
fde7fdd38d am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread 
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp

* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
  Fix a fun bug with multiple service bindings from an activity.
 2010-08-25 16:33:57 -07:00
Dianne Hackborn
50395e8071 Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread 2010-08-25 16:31:34 -07:00
Mathias Agopian
a62dfe9e49 am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp

* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
  Improve Sensors documentation a bit
 2010-08-25 16:07:25 -07:00
Mathias Agopian
94e939e879 Merge "Improve Sensors documentation a bit" into gingerbread 2010-08-25 16:03:58 -07:00
Andreas Huber
e58cd37d66 am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 
Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp

* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
  Fix support for per-frame unsynchronization in ID3V2.4 tags.
 2010-08-25 15:43:20 -07:00
Mathias Agopian
6d4346ce35 am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread 
Merge commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4' into gingerbread-plus-aosp

* commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4':
  fix [2946787] Screen flicker on low resolution setting in camcorder.
 2010-08-25 15:40:44 -07:00
Andreas Huber
8ac0983eda Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 2010-08-25 15:35:53 -07:00
Mathias Agopian
4cffbb47a2 Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread 2010-08-25 15:25:32 -07:00