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

108597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f406e23012 Merge "More work on procstats: save/restore state, fixes." 2013-06-29 02:14:10 +00:00
Dianne Hackborn
904a857d5a More work on procstats: save/restore state, fixes. 
We now persistent the current procstats to storage
to keep them across boots.  Still need to do division
and pruning across days; right now they will just keep
collecting forever.

Also fix some bugs in the checkin output.

Change-Id: I4dd9317dbe2ee0642af8f2f0be1f2bd9c4055e80
 2013-06-28 18:45:46 -07:00
Elliott Hughes
04971a736a am 1a6fe26d: am c63c0682: am e3b94f05: Merge "Track libcore API change." 
* commit '1a6fe26d1bd5bcfbd44ed9e6d2cf52c027b764a2':
  Track libcore API change.
 2013-06-28 18:15:40 -07:00
Elliott Hughes
1a6fe26d1b am c63c0682: am e3b94f05: Merge "Track libcore API change." 
* commit 'c63c068228267b41fb106e22a6914ab19da9e5bc':
  Track libcore API change.
 2013-06-28 18:13:29 -07:00
Elliott Hughes
c63c068228 am e3b94f05: Merge "Track libcore API change." 
* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.
 2013-06-28 18:11:10 -07:00
Elliott Hughes
e3b94f05b8 Merge "Track libcore API change." 2013-06-29 01:08:25 +00:00
Elliott Hughes
97c538d5f3 Track libcore API change. 
Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
 2013-06-28 18:03:46 -07:00
Zhijun He
b8b77bf59e Correct request template value for record and still 
they should match the request template values defined in camera3.h.

Bug 9213377

Change-Id: Ib24aa33a0ed59aff14b115c5d213ac287ea0d948
 2013-06-28 17:46:45 -07:00
Ben Murdoch
a182f129e4 Merge "Revert "Plumb View.getAccessibilityNodeProvider though WebViewProvider."" 2013-06-29 00:03:39 +00:00
Ben Murdoch
db2302513b Revert "Plumb View.getAccessibilityNodeProvider though WebViewProvider." 
This reverts commit 150cf1c15b23bb30be8b7267a5e8bc326d0f50cc.
 2013-06-29 01:02:48 +01:00
Elliott Hughes
6e7affeb3d am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp 
* commit 'b8292830f79fc76ffb9a1be5cd316212ac494d03':
  Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
 2013-06-28 16:53:27 -07:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp 
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
 2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master 
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
 2013-06-28 16:41:19 -07:00
Elliott Hughes
fca0f92e0a Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets." 2013-06-28 23:31:35 +00:00
Elliott Hughes
ebb77f55a9 am d1411efe: am 324993ab: am 5216f11e: Merge "Track libcore API update." 
* commit 'd1411efee372a37fcd0178f3ccffd9bf1d67b70b':
  Track libcore API update.
 2013-06-28 16:28:22 -07:00
Elliott Hughes
d1411efee3 am 324993ab: am 5216f11e: Merge "Track libcore API update." 
* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.
 2013-06-28 16:26:08 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets. 
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
 2013-06-28 16:24:48 -07:00
Elliott Hughes
324993abed am 5216f11e: Merge "Track libcore API update." 
* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.
 2013-06-28 16:23:47 -07:00
Elliott Hughes
5216f11e46 Merge "Track libcore API update." 2013-06-28 23:17:20 +00:00
Elliott Hughes
0e88a95480 Track libcore API update. 
Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
 2013-06-28 16:08:02 -07:00
Elliott Hughes
2687fa7f33 am 5d2d2222: am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit '5d2d22221a61258ff7dad29792bbf1201c746e8d':
  Track libcore API update.
 2013-06-28 16:04:44 -07:00
Elliott Hughes
5d2d22221a am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.
 2013-06-28 16:01:51 -07:00
Elliott Hughes
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -07:00
Elliott Hughes
ee66531f2f Merge "Track libcore API update." 2013-06-28 22:56:03 +00:00
Elliott Hughes
6859af17ce Track libcore API update. 
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
 2013-06-28 15:28:00 -07:00
Georgi Nikolov
57bb447754 Merge "Bugfix 9603757 master/flo tremendous Gallery battery drain on idle device (syncing pathology?)" 2013-06-28 22:23:32 +00:00
Ben Murdoch
d08ee870a0 Merge "Plumb View.getAccessibilityNodeProvider though WebViewProvider." 2013-06-28 21:18:03 +00:00
Georgi Nikolov
44c4ddfd47 Bugfix 9603757 
master/flo tremendous Gallery battery drain on idle device (syncing pathology?)

Change-Id: I52797fe428a817ac0bdafcf2ab2b0b565839f84c
 2013-06-28 14:12:09 -07:00
Elliott Hughes
1f3ad678be am 34ba52a0: am a9510297: am 505974eb: Merge "Track libcore API update." 
* commit '34ba52a060b01b5d91a64d8e7026387749c2bbb6':
  Track libcore API update.
 2013-06-28 13:11:57 -07:00
Elliott Hughes
34ba52a060 am a9510297: am 505974eb: Merge "Track libcore API update." 
* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.
 2013-06-28 13:09:58 -07:00
Elliott Hughes
a9510297a6 am 505974eb: Merge "Track libcore API update." 
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
 2013-06-28 13:07:21 -07:00
Elliott Hughes
505974eb73 Merge "Track libcore API update." 2013-06-28 20:04:29 +00:00
Craig Mautner
d9f254094e Merge "Do not reuse DisplayAdjustment in Display." 2013-06-28 20:00:56 +00:00
Craig Mautner
1abaa53dcc Do not reuse DisplayAdjustment in Display. 
Because the DisplayAdjustment in Display can be modified it should not
use the reference of the DisplayAdjustment that is passed in to
construct the Display. Copy the members of the DisplayAdjustment
instead.

Fixes bug 9622994

Change-Id: I8201b02eba3ef35af3e01f10402cd5dafec1fb23
 2013-06-28 12:03:32 -07:00
Romain Guy
c36fe2fc53 am 55e789db: am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 
* commit '55e789dbc782be0dcaf1d4bae5f32e9e2f674152':
  Fix out of range glCopyTexImage2D Bug #9425270
 2013-06-28 11:15:02 -07:00
Romain Guy
55e789dbc7 am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 
* commit 'ed96349a43133625d76fe7ba52ee4893c741ec41':
  Fix out of range glCopyTexImage2D Bug #9425270
 2013-06-28 11:10:59 -07:00
Romain Guy
ed96349a43 am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 
* commit '3d1b158e705f1ba83ac42dfe1aeaf25201638ef6':
  Fix out of range glCopyTexImage2D Bug #9425270
 2013-06-28 11:08:21 -07:00
Romain Guy
3d1b158e70 Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 2013-06-28 18:05:00 +00:00
Craig Mautner
1e09cfaa68 Merge "More debug for 9404689." 2013-06-28 18:01:33 +00:00
Elliott Hughes
5931afdc0f Track libcore API update. 
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
 2013-06-28 10:55:14 -07:00
Amith Yamasani
7f50ef7dda am 3f0decd7: am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 
* commit '3f0decd7dff8b4c12544c24b2d19a41d4eaacd03':
  When a new user AID is generated, dump it to dropbox
 2013-06-28 10:48:54 -07:00
Craig Mautner
f1f5054f7a More debug for 9404689. 
Changing focus to PhoneWindow.

Change-Id: I75c2ce6b1a20729daf8d2b7f83b2a871e1a7e642
 2013-06-28 10:43:07 -07:00
Amith Yamasani
3f0decd7df am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 
* commit '16a2268f8091e1b27cb1b1343d992c7509a2506e':
  When a new user AID is generated, dump it to dropbox
 2013-06-28 10:14:30 -07:00
Amith Yamasani
16a2268f80 am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 
* commit 'e6304a9c075ed927fc6bdffcc3191dc829f779fa':
  When a new user AID is generated, dump it to dropbox
 2013-06-28 10:12:21 -07:00
Amith Yamasani
e6304a9c07 Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 2013-06-28 17:08:38 +00:00
Amith Yamasani
5cdf7f5b2a When a new user AID is generated, dump it to dropbox 
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
 2013-06-28 09:58:43 -07:00
Daniel Sandler
8751a9644d Merge "move scoring, sound, vibration, and lights into a handler" 2013-06-28 16:36:11 +00:00
Dianne Hackborn
2179a522d3 Merge "Start really collecting PSS data for process stats." 2013-06-28 01:59:24 +00:00
Dianne Hackborn
cfc837f7fa Start really collecting PSS data for process stats. 
The activity manager now uses some heuristics to try to
sample PSS data from processes so that it can get enough
data to over reasonable time have something useful, without
doing it too aggressively.

The current policy is:

1. Whenever a significant global change happens (memory state,
   sceen on or off), we collect PSS from all processes; this will
   not happen more than every 10 minutes.
2. When all activities become idle, we will collect PSS from the
   current top process; this will not happen more than every 2
   minutes per process.
3. We will sample the top-most process's PSS every 5 minutes.
4. When an process's oom adj changes and it has been more than
   30 minutes since PSS has been collected from it, we will
   collect a new PSS sample.
5. If a process changes from service A to service B (meaning it
   has been running a service for a long time), we will collect
   a PSS sample from it.
6. If someone explicitly requests PSS data (for running services
   UI or dumpsys), record that.

Also:

- Finish moving the procstats output all to the new format.
- Record information about processes being killed due to excessive
  wake locks or CPU use in procstats.
- Rework how we structure common vs. per-package process stats to
  make it simpler to deal with.
- Optimize the Debug.getPss() implementation (we use it a lot now).
  Should probably optimize it further at some point.

Change-Id: I179f1f7ae5852c7e567de4127d8457b50d27e0f0
 2013-06-27 18:56:00 -07:00
Romain Guy
b254c242d9 Fix out of range glCopyTexImage2D 
Bug #9425270

A better solution would be to use glCopyTexImage2D whenever possible but
this change would be a little more dangerous.

Change-Id: Ib1aaceda39d838716285ef97f356721416822dbb
 2013-06-27 17:15:24 -07:00