Commit Graph

63067 Commits

Author SHA1 Message Date
Lorenzo Colitti
c346f72614 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
am: 19e84f7

* commit '19e84f7b750c97d5d7440af16c7ba18bf759e5dc':
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.

Change-Id: I3e6593324fa955ab3c0e590655d0632347f83ec8
2016-04-05 13:39:10 +00:00
Lorenzo Colitti
19e84f7b75 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
* changes:
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.
2016-04-05 13:35:09 +00:00
Lorenzo Colitti
a3d5948c37 Clear LinkProperties on interface removed.
When an interface is removed, all netlink events for that
interface are lost, because netd will no longer be able to
resolve the ifindex in the netlink event to an interface name,
and it only communicates to the framework events that include an
interface name.

This can cause us to end up with stale IP addresses if, for
example, wlan0 is removed because we switch wifi back from AP
mode to STA mode when exiting tethering. The presence of stale
IPv4 addresses can in turn lead us to miss a provisioning
notification because we already think we have an IPv4 address.

Change-Id: Ib64559a5a4fa261f483760b69fa7996314e7cc17
2016-04-05 20:28:57 +09:00
Keisuke Kuroyanagi
ca3fdc2bdc Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev
am: a46be16

* commit 'a46be16612573ce083404e8731a96ec30eba3c48':
  Fix: Selection handle behavior in scrolled TextView.

Change-Id: I36d2bb4d219242c9fe6cc159a0cd3f55489687dd
2016-04-05 09:30:51 +00:00
Keisuke Kuroyanagi
a46be16612 Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 2016-04-05 09:24:08 +00:00
Keisuke Kuroyanagi
7b6d818688 Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev
am: a1a56ed

* commit 'a1a56ed09cb3977c580098113a221c7764d31a58':
  Stop automatically creating action mode in FS extracted mode.

Change-Id: Ia74579cbd4115e3be10ded33cecb0fb16ffe6e90
2016-04-05 07:56:30 +00:00
Keisuke Kuroyanagi
a1a56ed09c Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 2016-04-05 07:50:47 +00:00
Keisuke Kuroyanagi
b1b8865017 Fix: Selection handle behavior in scrolled TextView.
When dragging a selection handle, it moves to strange position in
scrolled TextView because scroll position isn't took into account.
This issue was introduced by rebase mistaking in
I2a7e87ad08416f4bd01a5f6.

Bug: 28008281
Change-Id: I6217483fcc0b9a7e661f02a1f276114ddd5031a4
2016-04-05 16:26:16 +09:00
Pavel Zhamaitsiak
faa0492d6b Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev
am: f8565cd

* commit 'f8565cd3f30c60d8343dae3ca8c8bca18c5b451a':
  ConnectivityMetricsLogger: Switch to "pull" model

Change-Id: Ic01fa847282f4d8b37c85c1b877a85df73401200
2016-04-05 04:34:50 +00:00
Pavel Zhamaitsiak
f8565cd3f3 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 2016-04-05 04:29:12 +00:00
Adam Lesinski
ea0186c2c1 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
am: a149c42

* commit 'a149c42071197a7759a652accb399bc58ed62bcd':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I034e9ad42bf8e94ca97fd536ba1498fe19f01118
2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Ashutosh Joshi
c478365740 Merge "App upload to Context hub." into nyc-dev
am: b4cc448

* commit 'b4cc448946b2edb5802f60a3b1f97efbc8dd7ea0':
  App upload to Context hub.

Change-Id: I273a0503e847cd3fc3fadf85f65d5e5518bd1271
2016-04-05 01:37:49 +00:00
Ashutosh Joshi
b4cc448946 Merge "App upload to Context hub." into nyc-dev 2016-04-05 01:32:59 +00:00
Pavel Zhamaitsiak
ce13079ab3 resolve merge conflicts of 20ebbb3 to nyc-dev
Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df
2016-04-04 17:42:05 -07:00
Yohei Yukawa
acbcf0c687 Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev
am: 807c3a8

* commit '807c3a828b97e6d619f2dfdfde2f97efc873f6fe':
  Unhide View#dispatch{Start,Finish}TemporaryDetach()

Change-Id: I1e34c5dd1ce5d942def740224df56db35e0c7d95
2016-04-05 00:13:24 +00:00
Pavel Zhamaitsiak
20ebbb3349 Merge "ConnectivityMetricsLogger: Switch to "pull" model" into mm-wireless-dev 2016-04-05 00:13:18 +00:00
Yohei Yukawa
807c3a828b Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev 2016-04-05 00:05:09 +00:00
Ashutosh Joshi
cafdee9a72 App upload to Context hub.
Fix constants
Use helper functions to address OS

Change-Id: I61bd1f3eff2716ead2771eda335998f2e9b73afc
2016-04-04 16:50:27 -07:00
Adam Powell
379dbfe274 Merge "Tweaks for ScaleGestureDetector" into nyc-dev
am: 13af984

* commit '13af9845d4d6598dd64c4c8c99af93f92e7b56af':
  Tweaks for ScaleGestureDetector

Change-Id: I1bc8c19f1f64b3deda28538dfc81a2ef691ce656
2016-04-04 23:15:42 +00:00
Adam Powell
13af9845d4 Merge "Tweaks for ScaleGestureDetector" into nyc-dev 2016-04-04 23:06:00 +00:00
Roshan Pius
bbc3704933 Merge "power_profile: Move all wifi power values" into nyc-dev
am: bf8ea13

* commit 'bf8ea13069aec021739b9919a27741f1722466f6':
  power_profile: Move all wifi power values

Change-Id: I31b97ab5150ecb35797f699a7fc53adc8857c039
2016-04-04 22:29:34 +00:00
Adam Lesinski
3ad1b4899f Fix issue with overridden configuration in onConfigurationChanged
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.

Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
2016-04-04 15:24:48 -07:00
Roshan Pius
bf8ea13069 Merge "power_profile: Move all wifi power values" into nyc-dev 2016-04-04 22:21:25 +00:00
Chris Craik
517dad11db Merge "Fix how outlines are sent to rendernode" into nyc-dev
am: a7f775d

* commit 'a7f775db93235ab25636ab2350ccf6df2729c030':
  Fix how outlines are sent to rendernode

Change-Id: I5ffd4fbd553c3b81aca4290b8c03a9837ac7f31b
2016-04-04 22:14:25 +00:00
Chris Craik
a7f775db93 Merge "Fix how outlines are sent to rendernode" into nyc-dev 2016-04-04 22:08:32 +00:00
Jorim Jaggi
b99b23ef92 Do not call forceLayout if not needed
am: 26952d7

* commit '26952d748eaab23330c660fa0d7f5c0450dc1d06':
  Do not call forceLayout if not needed

Change-Id: I87adfe600252a6bc0c0880b4fff534cf67c027f7
2016-04-04 22:04:41 +00:00
Jorim Jaggi
26952d748e Do not call forceLayout if not needed
If the relevant frames for the app don't actually change, there is
no reason to call forceLayout and force a layout pass.

Bug: 27864358
Change-Id: I2add8cc5791023937afc154e6e50bbf7efb35adb
2016-04-04 21:56:48 +00:00
Adam Powell
c6df18f5fa Tweaks for ScaleGestureDetector
Remove obsolete history and size tracking from ScaleGestureDetector.

Change-Id: I20c323a8a92e467b62eb412b718c2e9e906e7800
2016-04-04 14:42:24 -07:00
Ruchi Kandoi
aa2936af2c Merge "PowerManager: Adds isSustainedPerformanceModeSupported()" into nyc-dev
am: a68fe1e

* commit 'a68fe1e4d3a34667e5948912c53290298388427b':
  PowerManager: Adds isSustainedPerformanceModeSupported()

Change-Id: Ief02f71f1230fda43386628d1d263800e5bab6d6
2016-04-04 20:48:16 +00:00
Ruchi Kandoi
a68fe1e4d3 Merge "PowerManager: Adds isSustainedPerformanceModeSupported()" into nyc-dev 2016-04-04 20:42:12 +00:00
Chris Craik
136d1af1cc Fix how outlines are sent to rendernode
bug:27918183

Fixes an issue where all convex outlines were pushed as empty rects to
RenderNode.

Also adds outline/reveal clip property logging, so such issues are
easier to debug in the future.

Change-Id: Ic4a996ecd09a8ef84cdf8b963bdb4853c7f6d180
2016-04-04 13:40:39 -07:00
Bo Liu
05d7c72d17 Merge "Expose setDrawGLFunctionDetachedCallback to webview" into nyc-dev
am: 2f1eb93

* commit '2f1eb93354d540efcb83e784ca28f6e91eca61d1':
  Expose setDrawGLFunctionDetachedCallback to webview

Change-Id: Ib47e6b22f5229565c043c4770d2f6f421772c203
2016-04-04 20:26:46 +00:00
Gustav Sennton
a9e0ec2ad0 Merge "Move more code from WebViewUpdateService to separate overridable class" into nyc-dev
am: 7182d98

* commit '7182d98777d44a3b410f743a12a16457caecd257':
  Move more code from WebViewUpdateService to separate overridable class

Change-Id: Ib680c97299788a3c670635df1c4d055003c19eef
2016-04-04 20:26:44 +00:00
Bo Liu
2f1eb93354 Merge "Expose setDrawGLFunctionDetachedCallback to webview" into nyc-dev 2016-04-04 20:20:10 +00:00
Gustav Sennton
7182d98777 Merge "Move more code from WebViewUpdateService to separate overridable class" into nyc-dev 2016-04-04 20:19:56 +00:00
Eino-Ville Talvala
6feb02b22f Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
am: 68a5811

* commit '68a5811711de6cfe0d61473576428b0a07bd6fb0':
  Camera: Allow preview operation of SCENE_MODE_HDR

Change-Id: I96617748e459bff941e84911049ff5461c0d1107
2016-04-04 19:46:07 +00:00
Eino-Ville Talvala
d7baa586d5 Merge "Camera: Add proper buffer drop errors to LEGACY mode" into nyc-dev
am: ecfbb0a

* commit 'ecfbb0a1bbd53be90d49834fdd4ffc9f5b93479c':
  Camera: Add proper buffer drop errors to LEGACY mode

Change-Id: Idb46f7f363a26d26231ec550e2785b39009c1542
2016-04-04 19:46:05 +00:00
Eino-Ville Talvala
68a5811711 Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev 2016-04-04 19:38:53 +00:00
Eino-Ville Talvala
ecfbb0a1bb Merge "Camera: Add proper buffer drop errors to LEGACY mode" into nyc-dev 2016-04-04 19:38:10 +00:00
Ruchi Kandoi
b4aa2e9c37 PowerManager: Adds isSustainedPerformanceModeSupported()
isSustainedPerformanceModeSupported() returns true if the device
supports the mode. It checks for the boolean config
"config_sustainedPerformanceModeSupported" to be set.

Bug: 22864186
Change-Id: I0f9f0bcbb8c02b19f37e9c87570d88e8f78f7992
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-04 19:25:23 +00:00
Eino-Ville Talvala
c7c569d5e4 Camera: Allow preview operation of SCENE_MODE_HDR
Some devices support HDR output for preview in addition to still
capture, so explicitly allow for that in the documentation of
SCENE_MODE_HDR.

Bug: 27313038
Change-Id: I894d7449dc0cfb7353f535db23acd12143590208
2016-04-04 10:48:38 -07:00
Yohei Yukawa
34305908c5 Merge "Fix a bug that IMS#mShowInputFlags is never updated." into nyc-dev
am: 40358e4

* commit '40358e436213ce844b402046d2064ad1a2ca2154':
  Fix a bug that IMS#mShowInputFlags is never updated.

Change-Id: I972bc85d7968322764d48bba58db3a39007ed8c8
2016-04-04 17:32:14 +00:00
Yohei Yukawa
40358e4362 Merge "Fix a bug that IMS#mShowInputFlags is never updated." into nyc-dev 2016-04-04 17:29:03 +00:00
Eino-Ville Talvala
385f9e2146 Camera: Add proper buffer drop errors to LEGACY mode
The correct stream ID is required to be sent along with buffer drop
errors, and LEGACY mode was putting in a placeholder.  This would
cause an error in the client-side implementation, triggered by
abortBuffers (Which is the only source of buffer drops from LEGACY).

Bug: 27828602
Change-Id: If3fba7a76f7aa0ff305efa4cce6c225eb720b30e
2016-04-04 10:28:20 -07:00
Phil Weaver
0bf4a59338 Merge "Make a11y text navigation by page symmetric." into nyc-dev
am: 7eb716c

* commit '7eb716c0f4a024e2673f6fce442005abd4dc19f5':
  Make a11y text navigation by page symmetric.

Change-Id: I27d276c301efd9365afba65acb1a9e54ae97f24e
2016-04-04 16:43:04 +00:00
Phil Weaver
020fa2420d Merge "Support SET_TEXT for editable text views." into nyc-dev
am: 2bf5f20

* commit '2bf5f20a2b9aeed688a9b0ffbf82f0368aae8023':
  Support SET_TEXT for editable text views.

Change-Id: Ief9820d9bb9f15f10fbcb6aaf660eee447a2fc6b
2016-04-04 16:43:02 +00:00
Phil Weaver
b11f31ff43 Merge "Add accessibility window title and anchor." into nyc-dev
am: d4a1932

* commit 'd4a19326085f2a68d568dfa754c29fd0ac49d193':
  Add accessibility window title and anchor.

Change-Id: I9b15bac883b470f06a41ee0b7ebf1b7d68e4ae2f
2016-04-04 16:43:00 +00:00
Phil Weaver
a7f6c78fe4 Merge "Remove docs for removed a11y gesture methods." into nyc-dev
am: 5af3084

* commit '5af3084049daf76aae1fd3af84c58ee4fa093415':
  Remove docs for removed a11y gesture methods.

Change-Id: Ic2ec2e0308238e48f5c9be6ee78d8d390248c3eb
2016-04-04 16:42:57 +00:00
Phil Weaver
7eb716c0f4 Merge "Make a11y text navigation by page symmetric." into nyc-dev 2016-04-04 16:37:05 +00:00