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

35111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
5a147d083c Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Justin Ho
34952c0121 DO NOT MERGE - Fixing capitalized ringtone metadata only 
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
 2010-10-26 09:05:06 -07:00
Mike Lockwood
1ebe049acc am 1b571bd3: am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:38:51 -07:00
Mike Lockwood
1b571bd3e9 am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:36:24 -07:00
Mike Lockwood
1d28a84059 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
977d362251 am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:17:07 -07:00
Eric Laurent
ecae8a43b7 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
1a58d9c398 Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Ben Murdoch
b9aa1d9d60 Merge "Update WebView useragent string for merge to WebKit r70209" 2010-10-26 07:44:34 -07:00
Gil Dobjanschi
ce03445c32 Effects and overlays are not modified when a video clip is trimmed. 
Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53
 2010-10-26 07:44:00 -07:00
Jeff Hamilton
858825c54d am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Joe Onorato
e7bc4f5e45 am a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:28:51 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Joe Onorato
a1e7474498 am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:24:41 -07:00
Ben Murdoch
566440cf3d Update WebView useragent string for merge to WebKit r70209 
Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
 2010-10-26 15:23:30 +01:00
Jeff Hamilton
79fb6449a1 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Mike Lockwood
9e3191d16c Location Manager: Fix LocationManager.getBestProvider filtering. 
getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-26 10:01:55 -04:00
Chet Haase
dcaff67a80 Merge "DisplayList optimizations and fixes." 2010-10-26 06:59:19 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Chet Haase
d98aa2de9a DisplayList optimizations and fixes. 
We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
 2010-10-26 06:54:55 -07:00
Gloria Wang
7f266f089e A temporary fix for "Waiting for service drm.drmManager". 
Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
 2010-10-26 03:31:13 -07:00
Jaikumar Ganesh
de9878d44f Merge "Add logs to debug incoming A2DP connection issue." 2010-10-26 00:32:06 -07:00
Jaikumar Ganesh
8febf88618 Add logs to debug incoming A2DP connection issue. 
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
 2010-10-26 00:28:39 -07:00
Jaikumar Ganesh
e8b7f399f1 Merge "Clean up some logging to make it more useful to debug." 2010-10-26 00:18:31 -07:00
Jaikumar Ganesh
b1ef244732 Clean up some logging to make it more useful to debug. 
Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
 2010-10-26 00:15:45 -07:00
Jim Miller
3ce0b7cd2d Merge "Fix 3117937: Add simplified "recent apps"." 2010-10-25 20:33:48 -07:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895. 
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
 2010-10-25 19:45:39 -07:00
Jaikumar Ganesh
bac9c29437 Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent." 2010-10-25 19:41:57 -07:00
Jack Palevich
46fa2f73ea Merge "Do not exit the GLSurfaceView thread when detached from a window." 2010-10-25 19:39:20 -07:00
Jack Palevich
fc5508bc99 Do not exit the GLSurfaceView thread when detached from a window. 
Allows a GLSurfaceView to be removed from a window and later reattached
to a window.

Change-Id: I2b44f35d0c95404b13912782df8877953609a5d0
 2010-10-25 19:38:13 -07:00
Jim Miller
44c66fe2cd Fix 3117937: Add simplified "recent apps". 
This adds a simplified recents view for devices that
don't handle 3D well.

Change-Id: I8307cd340caf1d65c8fce80eaf55a1d21bc64312
 2010-10-25 19:32:04 -07:00
Gil Dobjanschi
70bfc087d9 Check before and after media item reference 
Change-Id: I9abc017896ed82f069479a468e1b0b9d3303e3a6
 2010-10-25 19:17:35 -07:00
Gil Dobjanschi
479f788a7d Merge "Transition bug fix" 2010-10-25 19:13:32 -07:00
Jeff Brown
3f87246dd3 Merge "Tweak log messages a bit." 2010-10-25 18:51:57 -07:00
Joe Onorato
11e2e9b0c2 Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-25 18:48:08 -07:00
Romain Guy
74a040c914 Merge "Small cleanup." 2010-10-25 18:46:04 -07:00
Jaikumar Ganesh
a46f2fb152 Implement ACTION_CONNECTION_STATE_CHANGED intent. 
Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
 2010-10-25 18:44:57 -07:00
Romain Guy
9bca4793a3 Small cleanup. 
Removes unnecessary forward class declaration, make Caches::currentBuffer
private instead of public.

Change-Id: Idba6325c8c602d89239e667cb8ec87e7943f8e75
 2010-10-25 18:42:25 -07:00
Romain Guy
2c94ba7405 Merge "Don't change texture unit when not needed." 2010-10-25 18:36:13 -07:00
Romain Guy
3e3ba155fc Don't change texture unit when not needed. 
Change-Id: Ifa84426d234f2122402cb13533cb5964f1ce95ec
 2010-10-25 18:33:16 -07:00
James Dong
170a929648 Add two creation flags to OMXCodec::Create() 
o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
 2010-10-25 18:21:55 -07:00
Romain Guy
e6b80989b8 Merge "Don't change textures wrap modes on every draw." 2010-10-25 18:06:45 -07:00
Romain Guy
8164c2d338 Don't change textures wrap modes on every draw. 
Change-Id: If6d3f313778cc7f3e803a063338539c8b3e165e3
 2010-10-25 18:03:28 -07:00
James Dong
fc6d54ea07 Merge "Remove OMX.PV.* components from OMXCodec.cpp" 2010-10-25 18:02:44 -07:00
Jean-Baptiste Queru
33c4247435 am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'

* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
  frameworks/base: Handle null from topRunningNonDelayedActivityLocked
 2010-10-25 17:59:49 -07:00
James Dong
5592bcc57a Remove OMX.PV.* components from OMXCodec.cpp 
Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
 2010-10-25 17:59:44 -07:00
Scott Main
cd44bf9c7a Merge "resolved conflicts for merge of f0b3fa60 to master" 2010-10-25 17:56:40 -07:00
James Dong
068ee16b57 Merge "Don't change the video recording frame rate if it is not requested." 2010-10-25 17:56:14 -07:00
Scott Main
024127c11f resolved conflicts for merge of f0b3fa60 to master 
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
 2010-10-25 17:54:33 -07:00
Adam Powell
c841ef04eb Merge "Holo: vertical dividers, group button states, default window backgrounds." 2010-10-25 17:44:35 -07:00