Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,349 Commits 3 Branches 0 Tags
9d5c93f40758636fea18616cf915d49eca67d7b0
Commit Graph

57750 Commits

Author SHA1 Message Date
Doris Liu
9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp 
Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c
 2016-04-08 13:31:42 -07:00
Doris Liu
0e89f98044 Merge "Improve error logging for parsing failures" into nyc-dev 2016-04-08 18:02:51 +00:00
Doris Liu
0a1a5167be Improve error logging for parsing failures 
Bug: 27043594
Change-Id: I901b65f734c49444a78e0714e007e15e2340ab9d
 2016-04-08 18:01:54 +00:00
John Reck
620a86e464 Merge "Make stopped state a first-class thing" into nyc-dev 
am: c724dcf

* commit 'c724dcf23c5e2ebd22c042a8a6f2424b7e9d5029':
  Make stopped state a first-class thing

Change-Id: Idfa3cc5d8fa5b07c742c2700b38441ff7d692f42
 2016-04-08 15:17:03 +00:00
John Reck
c724dcf23c Merge "Make stopped state a first-class thing" into nyc-dev 2016-04-08 15:09:42 +00:00
Gustav Sennton
f6c4277d08 Merge "Create WebViewUpdateServiceImpl to move implementation there." into nyc-dev 
am: 1d16d77

* commit '1d16d773b0d2d12301bda68d15adc6953ce68710':
  Create WebViewUpdateServiceImpl to move implementation there.

Change-Id: Id9940a6b7cbcf4481eb4ec6f52387fd1d470b8a7
 2016-04-08 14:34:20 +00:00
Gustav Sennton
1d16d773b0 Merge "Create WebViewUpdateServiceImpl to move implementation there." into nyc-dev 2016-04-08 14:25:59 +00:00
Benjamin Franz
1acb890351 Merge "Throw security exception for non-parent aware APIs" into nyc-dev 
am: 5c1fbad

* commit '5c1fbadb1a1169186b7a0a357ae9c35183258c6c':
  Throw security exception for non-parent aware APIs

Change-Id: Ibfddb4d0894644adec0ea5aa9e9c7e55431ce5be
 2016-04-08 12:08:47 +00:00
Benjamin Franz
5c1fbadb1a Merge "Throw security exception for non-parent aware APIs" into nyc-dev 2016-04-08 12:02:26 +00:00
Ruchi Kandoi
e6f97ae2eb Merge "batteryService: Add Charge Counter." into nyc-dev 
am: 0f36ba8

* commit '0f36ba81e7a8c05d6500ce32197989c6fc3c30fc':
  batteryService: Add Charge Counter.

Change-Id: Ia15b676d999118b774b5cdc7695083e1d694ee3f
 2016-04-08 01:17:47 +00:00
Ruchi Kandoi
0f36ba81e7 Merge "batteryService: Add Charge Counter." into nyc-dev 2016-04-08 01:09:24 +00:00
Ruchi Kandoi
6361e22fea batteryService: Add Charge Counter. 
Bug: 27174034
Change-Id: Ib8bc8f617288c0ad543c67e0fa609c5a0c87b5fd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-04-08 01:09:02 +00:00
Jorim Jaggi
220a9090ac Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev 
am: 7c3912e

* commit '7c3912e4abc71886ad41e7be67d4eff41974d21f':
  Dismiss docked stack when opening non-resizable activity

Change-Id: I3c4953fdafc45b55217c9362799f88aeb23ca799
 2016-04-07 23:52:43 +00:00
Jorim Jaggi
7c3912e4ab Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev 2016-04-07 23:40:44 +00:00
Tim Murray
f2a63fda7d Merge "Improve service start/creation tracing." into nyc-dev 
am: d8ca02f

* commit 'd8ca02f25225a033ad0f69e1ad4a2af5df289db2':
  Improve service start/creation tracing.

Change-Id: I8bb66e4d51d05d98474d84d901182c52f98c4c4c
 2016-04-07 23:30:18 +00:00
Tim Murray
d8ca02f252 Merge "Improve service start/creation tracing." into nyc-dev 2016-04-07 23:19:38 +00:00
John Reck
c01a9b6a9b Merge "Fix some edge cases" into nyc-dev 
am: 4a62eff

* commit '4a62effbfe8ad9a0eb7049c2f52a57d39bb64e29':
  Fix some edge cases

Change-Id: I35a99c3164bf3bf91f609ce8bec01d15ca8b7c0d
 2016-04-07 23:12:14 +00:00
John Reck
4a62effbfe Merge "Fix some edge cases" into nyc-dev 2016-04-07 23:08:10 +00:00
Jorim Jaggi
d53f09254e Dismiss docked stack when opening non-resizable activity 
- Also move the toast to SysemUI as a cleanup.

Bug: 27341740
Bug: 28026841
Change-Id: Ic6196ed75511751c6fadb12fa24574c881100f65
 2016-04-07 16:07:27 -07:00
John Reck
945961f78a Make stopped state a first-class thing 
Bug: 27286867

WindowManager has committed to stopped state
controlling the lifecycle of the Surface, so
make that a first-class thing in HWUI as well.

This makes it more resistent to things like
a rogue updateSurface() happening while mStopped=true,
leading to bad things down the line. Instead let
the surface be changed/updated as often as desired,
and just block any attempt to draw on that surface.

Also removes some unnecessary makeCurrent()s, as
EglManager ensures that we *always* have a valid
GL context now (using a pbuffer surface if there is
no window surface set)

Change-Id: Iead78ddebc7997e8fdb0c9534836352f5e54b9bd
 2016-04-07 16:02:33 -07:00
Tim Murray
b6f5a4292b Improve service start/creation tracing. 
bug 27998068

Change-Id: If18ab5d293f0bb0dfbfbed2f2af383c349464963
 2016-04-07 15:37:43 -07:00
Vladislav Kaznacheev
ee03cdf9a7 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev 
am: e1efbce

* commit 'e1efbceeb76799e99e53821165ce6ea3f7f8d274':
  Hide unnecessary extra name constants in ClipDescription

Change-Id: Iacf66c41d405248ceb94a4acbf5088d6ef466551
 2016-04-07 22:28:26 +00:00
Vladislav Kaznacheev
e1efbceeb7 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev 2016-04-07 22:21:45 +00:00
John Reck
51f2d606dc Fix some edge cases 
Bug: 27709981

This desperately needs a refactor, but to keep
the current (really needed & nice) behavior of
dispatching after sync finishes would be difficult
to handle cleanly without lots of ripping so... #yolo

Change-Id: I831a06c6ae7412a062720d68ecbe3085190f0258
 2016-04-07 14:10:43 -07:00
Vladislav Kaznacheev
1dac79b2ba Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev 
am: 78740ad

* commit '78740add9b0bce8bf001fa6f1a064bbc1151c355':
  Rename View.DragShadowBuilder#onProvideShadowMetrics parameters

Change-Id: If96b5ebb8658d68b0f058216d23037a0f20a25f1
 2016-04-07 20:47:09 +00:00
Vladislav Kaznacheev
78740add9b Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev 2016-04-07 20:41:54 +00:00
Phil Weaver
5e0f193339 Merge "Treat accessibility gestures like physical ones." into nyc-dev 
am: fb6dd3b

* commit 'fb6dd3bbc18a425e25f9761cbcc96b8eb169b04f':
  Treat accessibility gestures like physical ones.

Change-Id: Idecb2de61673c94c44a128b32bcd035d050c604a
 2016-04-07 20:39:41 +00:00
Phil Weaver
fb6dd3bbc1 Merge "Treat accessibility gestures like physical ones." into nyc-dev 2016-04-07 20:34:34 +00:00
Jeff Sharkey
ea327017a9 Merge "Clarify version docs." into nyc-dev 
am: cff1025

* commit 'cff102508cf4cf1d2f298ebdba663bd27c458520':
  Clarify version docs.

Change-Id: I78c60a6a8f83c211eca854e2b1b56afbabc8e07b
 2016-04-07 20:15:31 +00:00
Alex Hills
52546b014b Merge "Adds support for MessagingStyle" into nyc-dev 
am: 5418765

* commit '5418765d4d0e4befef811c0a2cbc5d8a69ed6cfd':
  Adds support for MessagingStyle

Change-Id: I77354888ee4a6292896b0a6b5e85cee4f63af606
 2016-04-07 20:08:33 +00:00
Jeff Sharkey
cff102508c Merge "Clarify version docs." into nyc-dev 2016-04-07 20:08:18 +00:00
Jeff Sharkey
e721615f43 Clarify version docs. 
Change-Id: I64cc9e5e51f12d33e770e73734efd89df20c8504
 2016-04-07 14:07:10 -06:00
Alexander Hills
5418765d4d Merge "Adds support for MessagingStyle" into nyc-dev 2016-04-07 19:59:20 +00:00
Phil Weaver
155dda1e43 Treat accessibility gestures like physical ones. 
Gestures now operate on the screen as the user sees it, so they are
affected by magnification. This makes gesture coordinates consistent
with the node bounds in screen and makes an eye or head tracking service
work much more easily.

Bug: 27747314
Change-Id: Idee60398d49d8c9af7405d974893c796b034c974
 2016-04-07 12:20:27 -07:00
Alex Hills
fc737def02 Adds support for MessagingStyle 
This change adds support for the new MessagingStyle, which
supports a fully back-and-forth messaging/chat experience
within the notification display itself.

Bug:28043958
Change-Id: Ibb9c2a0784f028d8cf01bd3cee4fecc5f72d68cd
 2016-04-07 15:19:14 -04:00
Makoto Onuki
9a5ca319bc Merge "Fix sqlite time measurement." into nyc-dev 
am: c2c5b23

* commit 'c2c5b230995d8880c74b1cf6043cd43b317efabc':
  Fix sqlite time measurement.

Change-Id: I12afbae0eec6db332aae1b2e5fdf0300a36a8bd8
 2016-04-07 18:45:50 +00:00
Makoto Onuki
c2c5b23099 Merge "Fix sqlite time measurement." into nyc-dev 2016-04-07 18:38:42 +00:00
Jeff Sharkey
0f7426090a Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev 
am: 8b704d44

* commit '8b704d4474caf9fa0c7a734582fb6cce55248de4':
  Revert "Remove old FUSE bypass now that we have sdcardfs."

Change-Id: I65236959348e3a2781e82e9d56eecb58f5d7fcce
 2016-04-07 18:03:17 +00:00
Jeff Sharkey
16e0976152 Merge "Give users and devices control over sdcardfs." into nyc-dev 
am: 7d66e83

* commit '7d66e8313958e8225ea6c3df2ca6696dbc6d3d79':
  Give users and devices control over sdcardfs.

Change-Id: Ie2861a3268768fd6ed55e20bc8a746bb3bc61fff
 2016-04-07 17:56:33 +00:00
Chris Wren
9a9336868e Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev 
am: e7e7cb2

* commit 'e7e7cb2d057348644002e986eeb68c211c8fa071':
  add an onListenerDisconnected() callback to NLS

Change-Id: I1448b1e8c368c083313afb6c31582e32a502a684
 2016-04-07 17:56:30 +00:00
Jeff Sharkey
8b704d4474 Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev 2016-04-07 17:56:21 +00:00
Jeff Sharkey
8575da1cc0 Revert "Remove old FUSE bypass now that we have sdcardfs." 
This reverts commit feef8b62ee.

Change-Id: I90a3b8edf95cb5b631a85168671cf8b5a406d9ea
 2016-04-07 17:56:06 +00:00
Jeff Sharkey
7d66e83139 Merge "Give users and devices control over sdcardfs." into nyc-dev 2016-04-07 17:52:41 +00:00
Chris Wren
e7e7cb2d05 Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev 2016-04-07 17:44:10 +00:00
Jeff Sharkey
33dd156ed0 Give users and devices control over sdcardfs. 
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE.  Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.

Bug: 27991427
Change-Id: Ia57f12f6ead888ab85101004bdd8c8003537b116
 2016-04-07 11:30:55 -06:00
Chris Wren
5717bd6ddb add an onListenerDisconnected() callback to NLS 
Also block all callbacks if the listener is not connected.

Also update the documentation to make lifecycle restictions
more clear.

Bug: 27582839
Change-Id: I029304e1fb87bd8d754cfb4641ba8cc095fc2b2e
 2016-04-07 13:12:21 -04:00
Todd Kennedy
40ec11a392 Merge "Only parse an APK once" into nyc-dev 
am: 9d8da4c

* commit '9d8da4cdf182643cd015bbf7a8ae1da9e53eb8b4':
  Only parse an APK once

Change-Id: I8e8b09edd75912d4bac7556c3788d350599e9bd8
 2016-04-07 16:58:21 +00:00
Todd Kennedy
9d8da4cdf1 Merge "Only parse an APK once" into nyc-dev 2016-04-07 16:51:11 +00:00
Robin Lee
a948f8872a Merge "Internal API for system apps to determine default network for other apps" into nyc-dev 
am: 1b83651

* commit '1b83651e7fca620589a6317d3a8559e43a19485c':
  Internal API for system apps to determine default network for other apps

Change-Id: Ia928e2621e61946cdfa70ea186e9a00036dec4de
 2016-04-07 16:48:05 +00:00
Phil Weaver
8c1e665bc5 Merge "Allow tests to change UiAutomation flags." into nyc-dev 
am: d408b99

* commit 'd408b995c32710f8306af83c13cccdfa70cca242':
  Allow tests to change UiAutomation flags.

Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
 2016-04-07 16:48:01 +00:00