108624 Commits

Author SHA1 Message Date
Dianne Hackborn
2286cdc0ca Misc memory stuff.
- New Activity.reportFullyDrawn() method that applicatins can call
  when they know they are fully drawn, allowing us to have better
  app launch time info.  This data is also included in usage stats.
- Added total and free memory data "dumpsys meminfo".
- Tuned the moderate memory levels to be more aggressive about
  considering the device getting low on RAM, and thus starting
  to prune RAM from processes.
- Fixed issues in processstats when reading old data as well as
  resetting and other various fixes.

Change-Id: I20efe7451afb4edfa1aeec448328ba601c24d869
2013-07-02 11:21:04 -07:00
Craig Mautner
eaccd577b9 Merge "Change order of setting isOpen" 2013-07-01 20:42:38 +00:00
Craig Mautner
9b40728fdc Change order of setting isOpen
Because the WindowManager.addView() method can indirectly call
PhoneWindow.closePanel() it is critical to set isOpen after the
addView call returns in PhoneWindow.openPanel. Otherwise when
closePanel sets isOpen to false PhoneWindow will be in to an
inconsistent state.

Fixes bug 9404689.

Change-Id: If0129a0859546b35445df0f4be2f422c4807fba7
2013-07-01 13:03:19 -07:00
Zhijun He
276910b055 Merge "ImageReader: get correct jpeg size." 2013-07-01 19:42:05 +00:00
Dianne Hackborn
bae8614376 Merge "Fix issue #9611000: Random run-time restarts" 2013-07-01 18:42:20 +00:00
Craig Mautner
89d62fbad5 Merge "Set focus to launcher activity on return." 2013-07-01 18:41:40 +00:00
Dianne Hackborn
0d71de27b0 Fix issue #9611000: Random run-time restarts
Change-Id: I776f5e2434b81063780adf247fbd6db7f90c79c2
2013-07-01 11:40:46 -07:00
Zhijun He
534046d2b1 ImageReader: get correct jpeg size.
the jpeg size was set to the buffer width, which is the max jpeg buffer size.
the right size can be obtained by parsing the camera3_jpeg_blob data sent by
hal.

Also correct the buffer size check when crop is not set.

Bug: 9254294
Change-Id: Ic73de47ef97efa4eb356a399c1576715e2eacbfd
2013-07-01 11:03:41 -07:00
Wink Saville
8f5e3d13e1 Merge "Fix an NPE in NsdManager" 2013-07-01 16:53:31 +00:00
The Android Open Source Project
54d499f6db am 60c2772c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '60c2772ca7aa9d532a3b22e44b298e27204a40a5':
  Fix out of range glCopyTexImage2D Bug #9425270
  When a new user AID is generated, dump it to dropbox
  Recreate TextureView's display list on attach Bug #9425270
  Fix power issues around wifi scans.
2013-07-01 07:47:49 -07:00
The Android Open Source Project
60c2772ca7 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I03f18d4939d298225e8954dfff6dc9cdbe71b8c7
2013-07-01 07:42:58 -07:00
The Android Automerger
84791f01f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-01 05:55:32 -07:00
Lorenzo Colitti
7601e31d14 Merge "464xlat: use a gatewayed route, not point-to-point" 2013-07-01 00:29:12 +00:00
Joe Malin
7d4e24664a am 653efe73: am 6635e269: am e9df511e: DOC: Sync Adapters Android Training
* commit '653efe738e5390112393d5ad2567595b5c9dd51e':
  DOC: Sync Adapters Android Training
2013-06-30 09:22:58 -07:00
Joe Malin
653efe738e am 6635e269: am e9df511e: DOC: Sync Adapters Android Training
* commit '6635e26991e27d8cf28a04e9aff381511492b113':
  DOC: Sync Adapters Android Training
2013-06-30 09:20:56 -07:00
Joe Malin
6635e26991 am e9df511e: DOC: Sync Adapters Android Training
* commit 'e9df511e2018eb6a296408d09e355c6f2c77ae59':
  DOC: Sync Adapters Android Training
2013-06-30 09:17:51 -07:00
The Android Automerger
4c97ad0fc5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-30 05:55:29 -07:00
Joe Malin
e9df511e20 DOC: Sync Adapters Android Training
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
2013-06-29 21:46:59 -07:00
Romain Guy
a6471e8834 Merge "Make sure textviews draw in layers" 2013-06-29 02:22:50 +00:00
Romain Guy
21f4230274 Make sure textviews draw in layers
Change-Id: I993a430880ab66739aed1fa7ae625290b2349835
2013-06-28 19:19:30 -07:00
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
Craig Mautner
a8a90e0f52 Set focus to launcher activity on return.
Setting the focus to the top activity on the home stack when
changing stack. This got lost when setting the stack to the foreground
no longer set automatically set focus.

Fixes first half of bug 9580068.

Change-Id: Ic9a662579399c052e0f0992651a32094f4aa62d0
2013-06-28 15:24:50 -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
Romain Guy
d971caa5d5 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-28 14:37:24 -07:00
Amith Yamasani
937db2d48f When a new user AID is generated, dump it to dropbox
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
2013-06-28 14:37:13 -07:00
Romain Guy
f63fdf8680 Recreate TextureView's display list on attach
Bug #9425270

When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.

The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.

Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
2013-06-28 14:36:58 -07:00