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

102331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Shan Emily Lau
780dc88ddb Fix the media memeory stress test. 
The media memory stress test used the ps mediaserver to
capture the memory usage of mediaserver. As the media.log
is enabled recently, when runnign the ps mediaserver, it will
show both entries. The fix is simply skip the first two lines
and parse the laste output.

Change-Id: Ib2a4ba7936505b4ea24463bf8a5af2c499b71138
 2013-03-19 17:42:50 -07:00
Mathias Agopian
c7edf2b033 am 0a4962ad: Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 
* commit '0a4962ad11fadf7798c360efaee31b8d9d75bc9e':
  make Surface.java internal state thread-safe
 2013-03-20 00:27:46 +00:00
Mathias Agopian
10f21173f3 am 75d7309e: Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev 
* commit '75d7309eb407dbbc606c4f56397882ccac57070c':
  Fix createSurface / eglCreateWindowSurface race.
 2013-03-20 00:24:16 +00:00
Romain Guy
661a87ec28 Reduce number of glDraw calls when drawing text 
This change moves the mesh buffer from FontRenderer to CacheTexture
to help reduce the number of texture binds and glDraw calls when
drawing text that spans across multiple textures.

Change-Id: I7de574d88313ca3672879ca878c253ff5f131fc1
 2013-03-19 17:24:13 -07:00
Mathias Agopian
0a4962ad11 Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 2013-03-20 00:23:32 +00:00
Mathias Agopian
75d7309eb4 Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev 2013-03-20 00:21:11 +00:00
Craig Mautner
27389c9c11 Clear mWindowAdded when window was not added. DO NOT MERGE 
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
 2013-03-19 17:08:28 -07:00
Irfan Sheriff
11322434c6 Fix reading sleep policy 
Bug: 8418823
Change-Id: I432b0a1a7a13dcdd834f6a1c943b06937444f406
 2013-03-19 17:08:20 -07:00
Jim Miller
7d7443bcb9 am b3ba365c: Merge "Use persistent IRCD in KeyguardUpdateMonitor to show/hide music" into jb-mr2-dev 
* commit 'b3ba365c5c293dd0b82def17f1b5a5c3a6efec03':
  Use persistent IRCD in KeyguardUpdateMonitor to show/hide music
 2013-03-20 00:06:14 +00:00
Craig Mautner
54170de18f am dd8c10b8: Merge "Clear mWindowAdded when window was not added. DO NOT MERGE" into jb-mr2-dev 
* commit 'dd8c10b855d573cbb66df92bea10f58f376f462f':
  Clear mWindowAdded when window was not added. DO NOT MERGE
 2013-03-20 00:02:49 +00:00
Jim Miller
b3ba365c5c Merge "Use persistent IRCD in KeyguardUpdateMonitor to show/hide music" into jb-mr2-dev 2013-03-20 00:02:12 +00:00
Craig Mautner
dd8c10b855 Merge "Clear mWindowAdded when window was not added. DO NOT MERGE" into jb-mr2-dev 2013-03-20 00:00:17 +00:00
Jim Miller
8f09fd2e31 Use persistent IRCD in KeyguardUpdateMonitor to show/hide music 
Now that we can have multiple IRemoteControlDisplays, create a
persistent one in KeyguardUpdateMonitor so we can more efficiently
show and hide the music controls in keyguard.

Update after review: get the current state from KeyguardUpdateMonitor
*before* the first call to showApprpriateWidgetPage().  This fixes
a flash that was sometimes seen when transitioning between orientations.

Fixes bug 7517659

Change-Id: I1b7b6f4222a99891ec06d6b6fd779dd0b86cc367
 2013-03-19 16:59:29 -07:00
Craig Mautner
f403b1fe50 Clear mWindowAdded when window was not added. DO NOT MERGE 
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
 2013-03-19 16:58:00 -07:00
Irfan Sheriff
71e9d8b71c am 9f3d5505: Merge "Fix reading sleep policy" into jb-mr2-dev 
* commit '9f3d55056f315f7fc351e46ab1fac188d97c8277':
  Fix reading sleep policy
 2013-03-19 22:52:19 +00:00
Irfan Sheriff
9f3d55056f Merge "Fix reading sleep policy" into jb-mr2-dev 2013-03-19 22:48:13 +00:00
Irfan Sheriff
9f2e83135c Fix reading sleep policy 
Bug: 8418823
Change-Id: I432b0a1a7a13dcdd834f6a1c943b06937444f406
 2013-03-19 14:32:11 -07:00
Jason Sams
26c46054a8 am 4e43d76e: Merge "Move compute tests from frameworks/base to frameworks/rs" into jb-mr2-dev 
* commit '4e43d76e822dbc8d328fe0600b5fb9489f8ab75c':
  Move compute tests from frameworks/base to frameworks/rs
 2013-03-19 20:52:50 +00:00
Fabrice Di Meglio
cfd610ffd9 am 5054803a: Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev 
* commit '5054803a022b0df4cc616e19085ed6fb70ed33e8':
  Add missing ViewDebug infos for View.getTextDirection()
 2013-03-19 20:49:12 +00:00
Jason Sams
4e43d76e82 Merge "Move compute tests from frameworks/base to frameworks/rs" into jb-mr2-dev 2013-03-19 20:47:42 +00:00
Fabrice Di Meglio
5054803a02 Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev 2013-03-19 20:45:52 +00:00
ztenghui
effc9b4839 Add the orientation hint to the MediaMuxer 
bug:7991013

Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
 2013-03-19 13:10:25 -07:00
Jason Sams
eacf9c8041 Move compute tests from frameworks/base to frameworks/rs 
Change-Id: I670027782f5ba6df0713dbdc3c99ae7c1eef7d22
 2013-03-19 12:43:46 -07:00
John Michelau
116415271b Fix Watchdog HeartbeatHandler to run on correct thread 
The HeartbeatHandler for the System Server Watchdog has been running
on the wrong thread due to a race condition in initialization.  It's
designed to run on ServerThread, so that it can catch lockups in the
main looper of the System Server.  It has been running on
ActivityManagerThread instead, so it does not detect lockups on the
ServerThread as it should.

ActivityManagerService is calling Watchdog.getInstance() before
ServerThread calls Watchdog.getInstance().init(), so the handler is
being bound to the ActivityManagerThread instead of the ServerThread.

Explicitly bind HeartbeatHandler to ServerThread, so that the Watchdog
catches lockups on this critical thread.

Change-Id: Iccb184ac3adb817feb86ed4ee0e50e443bf74636
 2013-03-19 14:39:33 -05:00
Elliott Hughes
96112802bc am 80828f46: am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit '80828f465aea8cb34928c1467ac518e33bcca1b9':
  Remove dead code from DateUtils.
 2013-03-19 19:29:16 +00:00
Elliott Hughes
80828f465a am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit 'c1562075b0be58fa9dd09c2f2e9fa45601088574':
  Remove dead code from DateUtils.
 2013-03-19 12:27:10 -07:00
Elliott Hughes
c1562075b0 am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit 'ebebb80b4a629756128b5a4fcf483133f01dbfd7':
  Remove dead code from DateUtils.
 2013-03-19 12:24:50 -07:00
Romain Guy
2d60504a3b am df9d2ba9: Merge "Minimize texture binds when drawing text" into jb-mr2-dev 
* commit 'df9d2ba9b0b92608ea633bf04ffbef8d7ba3dd28':
  Minimize texture binds when drawing text
 2013-03-19 18:59:33 +00:00
Romain Guy
df9d2ba9b0 Merge "Minimize texture binds when drawing text" into jb-mr2-dev 2013-03-19 18:56:19 +00:00
Fabrice Di Meglio
83f15e657c Add missing ViewDebug infos for View.getTextDirection() 
- as getTextDirection() values were not showing in hierarchyviewer

Change-Id: I4ae74963a3c3b350ba996d098e5714b6538d9553
 2013-03-19 11:45:56 -07:00
Elliott Hughes
ebebb80b4a Merge "Remove dead code from DateUtils." 2013-03-19 18:45:54 +00:00
Elliott Hughes
9a6fa1d637 Remove dead code from DateUtils. 
This stuff is @hide, @deprecated, unused, and was never in any API level.

Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
 2013-03-19 11:36:12 -07:00
Romain Guy
115096f50a Minimize texture binds when drawing text 
When several CacheTextures are used to draw text, sort the
draw batches by texture ID to minimize state changes in the
driver.

This change also tweaks the font cache size and renames
a property that was too long to be set using setprop.

Change-Id: I0a36dfffe58c9e75dd7384592d3343c192d042b1
 2013-03-19 11:32:41 -07:00
Fabrice Di Meglio
430058f269 am 2d18e52b: Merge "Fix bug #8335710 TextView can\'t clear CompoundDrawables" into jb-mr2-dev 
* commit '2d18e52b00da92ca415b9da0aaac920a5e733f8b':
  Fix bug #8335710 TextView can't clear CompoundDrawables
 2013-03-19 17:42:29 +00:00
Fabrice Di Meglio
2d18e52b00 Merge "Fix bug #8335710 TextView can't clear CompoundDrawables" into jb-mr2-dev 2013-03-19 17:39:11 +00:00
Romain Guy
f8de06ade7 am 46888320: Merge "Update hardware acceleration compatibility docs" into jb-mr2-dev 
* commit '468883202457861dcef7eeb3c56dd724c79fb5fc':
  Update hardware acceleration compatibility docs
 2013-03-19 17:39:00 +00:00
Romain Guy
4688832024 Merge "Update hardware acceleration compatibility docs" into jb-mr2-dev 2013-03-19 17:36:43 +00:00
Romain Guy
bbb4e03ad4 Update hardware acceleration compatibility docs 
Change-Id: I3848eb281a06f4bdcbd603e9f624eff73314a4ec
 2013-03-19 10:31:38 -07:00
Elliott Hughes
291a140fe6 am 6d3b1338: am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 
* commit '6d3b13384e5ac4261eff264e7f8855610815e728':
  Fix times in debugging output to use H rather than k.
 2013-03-19 17:14:39 +00:00
Elliott Hughes
6d3b13384e am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 
* commit 'c9fe40ead549ff18393c0cc5c6e3bd67548f9da6':
  Fix times in debugging output to use H rather than k.
 2013-03-19 10:13:34 -07:00
Elliott Hughes
c9fe40ead5 am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 
* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7':
  Fix times in debugging output to use H rather than k.
 2013-03-19 10:11:19 -07:00
Elliott Hughes
71558f1faf Merge "Fix times in debugging output to use H rather than k." 2013-03-19 16:50:39 +00:00
Elliott Hughes
f9712395f9 am b5482b2f: am bab316fe: am e79af7df: Merge "Fix build." 
* commit 'b5482b2f8ac82143ae246794d237f35a471142d6':
  Fix build.
 2013-03-19 16:33:10 +00:00
Elliott Hughes
d4eeaf73e5 am ab8278e2: am 54519e70: Fix build. 
* commit 'ab8278e2eb69f9b9dc853934023af67073031b7b':
  Fix build.
 2013-03-19 16:33:07 +00:00
Elliott Hughes
110a98b672 am f7c01e5a: am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k." 
* commit 'f7c01e5a8a4e7e3032dd03a3705f6894312e9b5f':
  Clean up (some of) our many clocks to use H instead of k.
 2013-03-19 16:33:05 +00:00
Scott Main
603dd7c514 am d7cbec6d: am da9f385a: am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns 
* commit 'd7cbec6d10d520225806feda21f8656d9380797a':
  add search tags for Design patterns
 2013-03-19 16:33:02 +00:00
Scott Main
46d9d968b1 am 6008fca6: am b4b84f64: am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks 
* commit '6008fca61b3ab82e4cde4de00121301ff3edc95f':
  add search tags to Design building blocks
 2013-03-19 16:32:59 +00:00
Elliott Hughes
561a0ef4bf am c3e513e5: am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility." 
* commit 'c3e513e51caad56a30186d9e20a814dcc53e72ef':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
 2013-03-19 16:32:56 +00:00
Scott Main
cfa824e2a3 am 11f36b80: am 0e4071c7: am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs 
* commit '11f36b80d494a6c9df235e32b61820187eb8f22e':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
 2013-03-19 16:32:54 +00:00
Elliott Hughes
b5482b2f8a am bab316fe: am e79af7df: Merge "Fix build." 
* commit 'bab316fea269369194d3126a5d79409c9192580f':
  Fix build.
 2013-03-19 09:31:13 -07:00