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

35147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
76860e3fe7 Tweak log messages a bit. 
Change-Id: Ifadf78c1ab8db49106216c70086f98860795c65f
 2010-10-25 17:37:46 -07:00
Adam Powell
5d2b178f5c Holo: vertical dividers, group button states, default window backgrounds. 
Change-Id: I06b1397a8026d01a2e4eca7e87ca2d1edbe4f92e
 2010-10-25 17:32:53 -07:00
Jean-Baptiste Queru
5574453022 Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 17:28:29 -07:00
Jean-Baptiste Queru
66a5d695ed resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp 
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
 2010-10-25 17:27:16 -07:00
Justin Ho
7c7ff8c84f am 41d21efd: (-s ours) am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397'

* commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 17:25:02 -07:00
Scott Main
f0b3fa60db am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos
 2010-10-25 17:23:10 -07:00
Scott Main
3d40cd5055 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
 2010-10-25 17:15:50 -07:00
Jaikumar Ganesh
63f298a9b1 Merge "Fix docs builds." 2010-10-25 17:09:16 -07:00
Mathias Agopian
b9737a1d1b Updade Surface (ANativeWindow) format based on its buffers format 
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
 2010-10-25 17:08:37 -07:00
Jaikumar Ganesh
5514029304 Fix docs builds. 
Change-Id: I764bd0f0f6994cc468b7ebbea4a3dc7a44b9f89d
 2010-10-25 17:07:51 -07:00
Gloria Wang
cbb053c3c9 resolved conflicts for merge of 965f960e to master 
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
 2010-10-25 16:56:49 -07:00
Justin Ho
41d21efd61 am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 16:50:34 -07:00
Justin Ho
044df235c8 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Jaikumar Ganesh
657dbfaedb Merge "Expose Vendor Specific Headset Event Intent." 2010-10-25 16:43:41 -07:00