47799 Commits

Author SHA1 Message Date
Hui Lu
d22f23b2d6 am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
  Reconnect/teardown proxy network connectivity.
2014-02-25 18:03:07 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Baligh Uddin
e794dd5c52 Merge "Import translations. DO NOT MERGE" 2014-02-25 17:16:07 +00:00
Narayan Kamath
deaa6cc34d am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit 'cc99b18ce30e6847bd9b29129755f63efd4f06fe':
  Use reinterpret_cast when an integer is cast to a pointer
2014-02-25 13:20:52 +00:00
Narayan Kamath
58908b02f3 am d8410d38: am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit 'd8410d38cf2eb133dab29aec722dce862584d115':
  Use long for pointers in opengl/EGL classes
2014-02-25 13:20:47 +00:00
Narayan Kamath
a6f70d8b2d am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
  Use reinterpret_cast when an integer is cast to a pointer
2014-02-25 13:14:35 +00:00
Narayan Kamath
614b00de9c am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
2014-02-25 13:14:30 +00:00
Narayan Kamath
2ba70fd49b Merge "Use reinterpret_cast when an integer is cast to a pointer" 2014-02-25 13:05:48 +00:00
Kenny Guy
e21c52a8c9 Merge "Hide managed profiles from user switchers." 2014-02-25 13:01:38 +00:00
Derek Sollenberger
f5a9ad1cd0 Merge "Updates to the Skia API needed to merge the WebView m33 version of Skia." 2014-02-25 12:54:31 +00:00
Nicolas Prevot
1f63810638 Merge "Adding the requiredForProfile flag." 2014-02-25 10:35:25 +00:00
Alan Viverette
6dd4e28b60 Merge "Force measurement in LinearLayout if any views are skipped" 2014-02-25 02:49:02 +00:00
Alan Viverette
65be9cc34c Force measurement in LinearLayout if any views are skipped
BUG: 12249256
Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
2014-02-24 18:21:09 -08:00
Dianne Hackborn
7a603b294d Merge "Fix some issues with network usage in battery stats." 2014-02-25 01:07:42 +00:00
Dianne Hackborn
fb7b50a026 Fix some issues with network usage in battery stats.
Change-Id: I8b354872511fcb55cecb2e09aada2eab41a1e202
2014-02-24 17:06:14 -08:00
Justin Koh
bf3a45f3ad Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 2014-02-25 00:20:45 +00:00
Takahiro Aizawa
5b4a857603 DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
2014-02-25 00:00:16 +00:00
Zhijun He
cc28a41b48 Camera2: Correct some minor errors in awb region spec
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
2014-02-24 15:11:23 -08:00
Jeff Brown
3651cb7b4a am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit 'cd9cd758d6dc884220f86ff10812c9e33a978de5':
  Start the dream manager even if dreams are not supported.
2014-02-24 22:25:19 +00:00
Jeff Brown
c213b3a34c am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit 'f7f80d7b54b11d432bb6e72da526edf369128ea7':
  Start the dream manager even if dreams are not supported.
2014-02-24 22:18:32 +00:00
Jeff Brown
f7f80d7b54 Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 2014-02-24 22:16:00 +00:00
Jeff Brown
e0dd3ca81d Start the dream manager even if dreams are not supported.
The dreams manager also manages dozing.  It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).

Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.

Bug: 12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
2014-02-24 14:07:27 -08:00
Chris Craik
be85725e1e Merge "Damage IsolatedZVolume when shadows change" 2014-02-24 21:22:24 +00:00
Derek Sollenberger
b644a3b845 Updates to the Skia API needed to merge the WebView m33 version of Skia.
This is a cherry-pick of 2 CLs:

21969a2b26945da3fd86aef7c93479e4fb359a65
c7a581cf7691db5c61e6694aa51daaa994004bd9

Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
2014-02-24 15:44:31 -05:00
John Reck
ee64201004 Merge "Add back resize buffer" 2014-02-24 20:41:16 +00:00
Dianne Hackborn
aec25d9224 Merge "Improve how battery stats collects network stats." 2014-02-24 20:33:42 +00:00
Alan Viverette
462c2177f7 Check for ongoing detachment in AbsListView
BUG: 13167767
Change-Id: Ie1a828eadbb99daef46af77544f233fee09fd1bc
2014-02-24 12:24:47 -08:00
Dianne Hackborn
d0c5b9abed Improve how battery stats collects network stats.
This optimizes the path for battery stats to collect
per-uid network usage.  It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
2014-02-24 11:35:20 -08:00
Kenny Guy
1a447535ce Hide managed profiles from user switchers.
Hide managed profiles from lockscreen user switcher on tablets.
Hide managed profiles from power menu user switcher on phones.
Add flag to enable multi user ui turned off by default.

Change-Id: I4c69a6f7b0f39c249fc85fd940318df1ddab073f
2014-02-24 19:24:42 +00:00
Alan Viverette
35e2721399 Merge "Check for null view root before checking for accessibility focus" 2014-02-24 19:09:59 +00:00
Alan Viverette
2e6fc8ca56 Check for null view root before checking for accessibility focus
BUG: 13168971
Change-Id: Ia75d77b18112371f56a624e11f9509f14ec98093
2014-02-24 11:09:18 -08:00
Baligh Uddin
7611358c2c Import translations. DO NOT MERGE
Change-Id: Ib0fdb2ae24f01965b326db5b9fe5f9a1e31bc332
Auto-generated-cl: translation import
2014-02-24 10:59:08 -08:00
Zhijun He
688084914d Merge "Camera2: update 3A state related metadata key docs" 2014-02-24 18:40:03 +00:00
Zhijun He
60b19dc2df Camera2: update 3A state related metadata key docs
Bug: 12840262
Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
2014-02-24 10:19:20 -08:00
Chad Brubaker
4845037a48 Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
Nicolas Prevot
531270a4a1 Adding the requiredForProfile flag.
Enabling to use requiredForProfile in application manifests
It determines which applications will be installed for managed profiles
and for restricted profiles

Change-Id: I14b4de2c9f41c2bbf5cd9fd0ca6caf5ce2d04131
2014-02-24 18:03:14 +00:00
Ashok Bhat
84bbeb9e0c Use long for pointers in opengl/EGL classes
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen script

This patch updates EGL classes in frameworks/base to support
64-bit platforms. Key changes in the EGL classes include

[x] EGLObjectHandle class - EGLObjectHandle class has two public
    methods (constructor and getHandle) that assume handles are
    32-bit. They have not been changed. Instead, two new hidden
    methods (EGLObjectHandle(long) and getNativeHandle) have been
    added.

[x] EG14 class - Two public methods eglGetDisplay and
    eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
    They have been changed to throw unsupported operation exception
    on non 32-bit machines. Two new methods eglGetDisplay(long)
    and eglCreatePbufferFromClientBuffer(...long buffer..) have
    been added to support 64-bit handles.

Change-Id: I9e0f064e5b33700eb0baa2e1841a21f931f7a765
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-24 15:50:22 +00:00
Ashok Bhat
01c26ea89d Use reinterpret_cast when an integer is cast to a pointer
Note that files changed in this patch have been generated
by running frameworks/native/opengl/tools/glgen/gen script.

Change-Id: Iff3ac2e804af41b9a6ec073fd65019c6806fe821
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-24 14:33:52 +00:00
Torne (Richard Coles)
875e2101d7 Fix missing # in method name in javadoc.
Fix doc generation.

Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
2014-02-24 14:11:56 +00:00
Yohei Yukawa
e0ebe276e5 Merge "Remove trailing spaces and tabs" 2014-02-24 11:20:49 +00:00
Yohei Yukawa
66996dafa7 Remove trailing spaces and tabs
Actual fix will be covered by subsequent patches.

BUG: 12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
2014-02-24 19:51:04 +09:00
Sander Alewijnse
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
Alan Viverette
12b97f5d2b Change colorFilterColor to tint, allow use of ColorStateList
BUG: 13149901
Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
2014-02-23 18:32:20 -08:00
Alan Viverette
cc3f33853b Allow alpha modulation in ColorStateList items
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.

Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
2014-02-22 16:52:46 -08:00
Craig Mautner
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
2014-02-22 07:51:02 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
2014-02-22 07:33:24 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
John Reck
e56e9df5f1 Add back resize buffer
Bug: 12825810

Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
2014-02-21 18:12:04 -08:00
Chris Craik
ff641477a7 Damage IsolatedZVolume when shadows change
bug:12874322
Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
2014-02-21 16:59:56 -08:00