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

64505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2afcd2d1a2 am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 
* commit '3938e4fbaae132db9b4676ba26f6b3c042a6879e':
  docs: emphasize qualifier order and mention implicit version qualifer
 2012-01-13 18:25:44 -08:00
Scott Main
ce346e1cee am 114875e8: am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 
* commit '114875e837163e1029536439ec3891bc2582acf2':
  docs: mention x86 as a native platform filter
 2012-01-13 18:25:34 -08:00
Dianne Hackborn
dda932005b am d4d68fe2: am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'd4d68fe20259e2d6aaae8bc4a38b360aa0b57081':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:25:31 -08:00
Daniel Sandler
72bc790705 am 80c4cd1f: am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
* commit '80c4cd1fd7d44fcacbff7d4903ce227eb3add1e3':
  cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
 2012-01-13 18:25:28 -08:00
Scott Main
3938e4fbaa Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 2012-01-13 18:23:40 -08:00
Scott Main
114875e837 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
  docs: mention x86 as a native platform filter
 2012-01-13 18:23:35 -08:00
Dianne Hackborn
d4d68fe202 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:23:34 -08:00
Daniel Sandler
80c4cd1fd7 am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
  cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
 2012-01-13 18:23:33 -08:00
Scott Main
40d6e7d913 Merge "docs: mention x86 as a native platform filter" into ics-mr1 2012-01-13 18:21:42 -08:00
Scott Main
e2225df259 docs: mention x86 as a native platform filter 
Change-Id: I003b1e0e649f36e8971df85ef2a28f991875d605
 2012-01-13 18:20:10 -08:00
John Reck
06e09f6928 Expand WebKitHitTest and do some preliminary caching 
Change-Id: Id9e9cc11f1482f434133e70b14970d7248a39008
 2012-01-13 17:56:49 -08:00
Irfan Sheriff
ba8aa433d5 Merge "cleanup for concurrency" 2012-01-13 16:41:41 -08:00
Irfan Sheriff
fc7f95abcd cleanup for concurrency 
Allow multiple instances of WifiMonitor and WifiNative to be
created in preparation for multiple socket connections

Change-Id: I06a227f87f1406dc62f884d56ad639ac623414b6
 2012-01-13 16:38:43 -08:00
Dianne Hackborn
cc7bd5ab55 Merge "Update notification documentation to follow current guidelines." into ics-mr1 2012-01-13 16:36:05 -08:00
Michael Kolb
ba82e0675e Merge "fix layer scrollbar updates" 2012-01-13 16:25:14 -08:00
Michael Kolb
4695e20aa5 fix layer scrollbar updates 
Bug: 5868791

tell webkit the layer has been scrolled

Change-Id: Ib12963340d950be992fbe5f9520c9a33c04404e8
 2012-01-13 16:15:11 -08:00
Glenn Kasten
e6f8a425da Fix locking for mMasterVolume and mMute 
mMasterVolume and mMute are both protected by mutex in AudioFlinger class, but
there were two places where they were accessed without a mutex.

Also make AudioFlinger::mMasterMute private not protected.

Change-Id: Ia3897daeb5c50313df5bcc071824357526237f3e
 2012-01-13 15:53:10 -08:00
Jeff Sharkey
438304d515 Merge "Introduce FileRotator." 2012-01-13 15:33:42 -08:00
Jeff Sharkey
a27a3e8ad7 Introduce FileRotator. 
Utility that rotates files over time, similar to logrotate. There is
a single "active" file, which is periodically rotated into historical
files, and eventually deleted entirely. Files are stored under a
specific directory with a well-known prefix.

Bug: 5386531
Change-Id: I29f821a881247e50ce0f6f73b20bbd020db39e43
 2012-01-13 15:27:28 -08:00
Glenn Kasten
4790bd8be8 AudioTrack and AudioFlinger send level cleanup 
Add an API to control block for getting/setting send level.
This allow us to make the mSendLevel field private.

Document the lack of barriers.

Use 0.0f to initialize floating-point values (for doc only).

Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
 2012-01-13 15:25:14 -08:00
Jeff Brown
4bedb48103 Merge "Fix compilation with Clang." 2012-01-13 15:16:59 -08:00
Jeff Brown
dfef19940f Merge "Fix a few memory leaks in the input dispatcher." 2012-01-13 15:16:29 -08:00
Daniel Sandler
bd9d9d3ae2 cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
Change-Id: I8910c0982ffe2be482f6ae1a49343a1c79be0632
 2012-01-13 15:12:07 -08:00
Glenn Kasten
faf354dc7f Use size_t for frame size 
except in the control block, where we don't have room.

In AudioFlinger::ThreadBase::TrackBase::getBuffer,
read the frame size from control block only once.

Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
 2012-01-13 14:58:44 -08:00
Gilles Debunne
893eace609 Merge "Sub display list in TextView" 2012-01-13 14:53:54 -08:00
David 'Digit' Turner
d615f34b56 Merge "media/mtp: Add missing LOCAL_C_INCLUDES" 2012-01-13 14:32:50 -08:00
Stephen Hines
d36f7d2495 Merge "Add support for new root.expand() calls." 2012-01-13 13:57:24 -08:00
Glenn Kasten
1e80869133 Get AID_GRAPHICS from right place 
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
 2012-01-13 13:45:39 -08:00
Kenny Root
fcbbaf1d83 resolved conflicts for merge of e80341c8 to master 
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
 2012-01-13 13:39:28 -08:00
Kenny Root
e80341c8c5 am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries
 2012-01-13 13:12:34 -08:00
Kenny Root
2ddf6ea6dc Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 2012-01-13 13:11:02 -08:00
Dianne Hackborn
f88d1493aa am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '100651779fde99f7ae2a10719d688b51115f08e9':
  Fix issue #5823276: home repaints after full-screen app is exited
 2012-01-13 13:01:48 -08:00
Dianne Hackborn
100651779f am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '2e282f35b009fe4c23daca35592dae2032641643':
  Fix issue #5823276: home repaints after full-screen app is exited
 2012-01-13 12:58:45 -08:00
Dianne Hackborn
2e282f35b0 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-13 12:56:40 -08:00
Bart Sears
31cef1451e am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1 
* commit 'bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
  Update to latest version of Roboto
 2012-01-13 12:37:53 -08:00
Bart Sears
bcce2a1953 am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1 
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
  Update to latest version of Roboto
 2012-01-13 12:35:07 -08:00
Bart Sears
da7b7700d0 Merge "Update to latest version of Roboto" into ics-mr1 2012-01-13 12:32:43 -08:00
Christopher Tate
ecce05fac6 am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 
* commit '89620c5d982858f590f3740169c9f69ee380be3e':
  Streamline package-installed handling by the Backup Manager
 2012-01-13 12:18:55 -08:00
Romain Guy
60c6b082ea Merge "Remove unused parameter" 2012-01-13 12:13:52 -08:00
Romain Guy
44d79747b5 Remove unused parameter 
Change-Id: I0896b2cdb9f1fa9c5e191e4ea425e22ac6f10f29
 2012-01-13 12:12:09 -08:00
Christopher Tate
89620c5d98 am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 
* commit '2cf18d28785fdd188641867503586627cb212302':
  Streamline package-installed handling by the Backup Manager
 2012-01-13 12:08:09 -08:00
Christopher Tate
2cf18d2878 Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 2012-01-13 11:49:20 -08:00
Bart Sears
6c16a58b2c Update to latest version of Roboto 
Bug: 5527891

U+0125 (h with Circumflex):  Moved the Circumflex to not stick out
       beyond the left edge of the "h"
U+0300, U+0301, U+0303, U+0309, U+030F, U+0323: Move to the left so
       that they can be composited.
U+047C (Capital Omega with Titlo): Fixed the Titlo accent
U+047D (Small Omega with Titlo): Fixed the Titlo accent
U+048E (Capital ER with tick): Changed the tick to be diagonal
U+2248 (Almost equal to):  Added the glyph

Change-Id: Ibcadcd008a58f42d8bd4238d768101d8bf726ff6
 2012-01-13 11:44:23 -08:00
John Huang
70f52e6d79 am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 
* commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
  Fix teardown of secondary connections on CDMA
 2012-01-13 11:41:01 -08:00
John Huang
e65723044d am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
  Fix teardown of secondary connections on CDMA
 2012-01-13 11:39:03 -08:00
John Huang
2753e826b2 Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 2012-01-13 11:37:15 -08:00
Jean-Baptiste Queru
134a683565 am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:28:09 -08:00
Jean-Baptiste Queru
c0ef548c74 am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:25:09 -08:00
Jean-Baptiste Queru
d75961eecb am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:22:08 -08:00
Robert Ly
3e9aa56e56 am 7da0abc5: am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 
* commit '7da0abc52e3cbdeeb7fae0d22895710254ef9ec4':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
 2012-01-13 11:20:43 -08:00