Selim Gurun
a64ebd5727
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c4827a
...
am: e7534f48ce
2017-04-10 16:56:06 +00:00
Daniel Nishi
5e7d2af825
Merge "Move the movies metrics constant back into O."
2017-04-10 16:50:18 +00:00
Selim Gurun
e7534f48ce
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
...
am: c922c4827a
2017-04-10 16:48:28 +00:00
TreeHugger Robot
c922c4827a
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
2017-04-10 16:36:48 +00:00
Eugene Susla
6af6529b07
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev am: 0ac8fd7adb
...
am: d2d45e9de8
2017-04-10 15:23:02 +00:00
Eugene Susla
d2d45e9de8
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
...
am: 0ac8fd7adb
2017-04-10 15:18:14 +00:00
Erik Kline
d4d93ac799
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev am: e9ec87d0d4
...
am: 09d6e39613
2017-04-10 15:17:54 +00:00
Erik Kline
09d6e39613
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
...
am: e9ec87d0d4
2017-04-10 15:09:14 +00:00
TreeHugger Robot
0ac8fd7adb
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
2017-04-10 15:06:10 +00:00
Erik Kline
e9ec87d0d4
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
2017-04-10 14:57:49 +00:00
Bryce Lee
eb346fc10d
Merge "Update decor LayoutParams when window is already added." into oc-dev am: 9c80a16c45
...
am: da9546bebb
2017-04-10 14:38:07 +00:00
Bryce Lee
da9546bebb
Merge "Update decor LayoutParams when window is already added." into oc-dev
...
am: 9c80a16c45
2017-04-10 14:30:08 +00:00
Bryce Lee
9c80a16c45
Merge "Update decor LayoutParams when window is already added." into oc-dev
2017-04-10 14:22:53 +00:00
Andrei Stingaceanu
d41320a3d0
Merge "AutoSize TextView - fix measurements" into oc-dev am: e812e7dc2e
...
am: de8aec39bf
2017-04-10 13:06:49 +00:00
Andrei Stingaceanu
de8aec39bf
Merge "AutoSize TextView - fix measurements" into oc-dev
...
am: e812e7dc2e
2017-04-10 13:02:40 +00:00
Charles He
151d60c6fc
Merge "VPN: cancel always-on notification with new id" into oc-dev am: 4286c5768d
...
am: 5744ea2c0d
2017-04-10 13:02:15 +00:00
Charles He
5744ea2c0d
Merge "VPN: cancel always-on notification with new id" into oc-dev
...
am: 4286c5768d
2017-04-10 12:53:29 +00:00
Andrei Stingaceanu
e812e7dc2e
Merge "AutoSize TextView - fix measurements" into oc-dev
2017-04-10 12:48:36 +00:00
Charles He
4286c5768d
Merge "VPN: cancel always-on notification with new id" into oc-dev
2017-04-10 12:43:36 +00:00
Erik Kline
5f2b7992cf
Tethering: support Local-only Hotspot mode for downstreams
...
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug: 31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
2017-04-10 21:42:16 +09:00
Eric Sandness
c4f821c16e
Merge "Fix mock of setApplicationRestrictions()" into oc-dev am: c9a6e75682
...
am: 0a6fd9847c
2017-04-10 12:32:44 +00:00
Erik Kline
2e444fcb84
Merge "Tethering: support Local-only Hotspot mode for downstreams" am: d3128d4b55 am: 908ce167eb am: f6626e812c
...
am: f700d5cad7
2017-04-10 12:31:26 +00:00
Eric Sandness
0a6fd9847c
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
...
am: c9a6e75682
2017-04-10 12:27:17 +00:00
Erik Kline
f700d5cad7
Merge "Tethering: support Local-only Hotspot mode for downstreams" am: d3128d4b55 am: 908ce167eb
...
am: f6626e812c
2017-04-10 12:21:57 +00:00
Eric Sandness
c9a6e75682
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
2017-04-10 12:18:16 +00:00
Erik Kline
f6626e812c
Merge "Tethering: support Local-only Hotspot mode for downstreams" am: d3128d4b55
...
am: 908ce167eb
2017-04-10 12:12:17 +00:00
Erik Kline
908ce167eb
Merge "Tethering: support Local-only Hotspot mode for downstreams"
...
am: d3128d4b55
2017-04-10 12:02:49 +00:00
Treehugger Robot
d3128d4b55
Merge "Tethering: support Local-only Hotspot mode for downstreams"
2017-04-10 11:50:32 +00:00
Emilian Peev
0b80b0f5bf
Merge "DngCreator: Populate baseline exposure tag" into oc-dev am: b96891e0e3
...
am: db1de8dd64
2017-04-10 10:23:39 +00:00
Emilian Peev
db1de8dd64
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
...
am: b96891e0e3
2017-04-10 10:14:31 +00:00
Erik Kline
ea9cc488eb
Tethering: support Local-only Hotspot mode for downstreams
...
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug: 31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
2017-04-10 19:11:08 +09:00
TreeHugger Robot
b96891e0e3
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
2017-04-10 10:04:05 +00:00
Andrei Stingaceanu
549482bfcb
AutoSize TextView - fix measurements
...
The BoringLayout measurements for auto-size are
incorrect. Removed those and kept the StaticLayout
measurements.
Bug: 36940118
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t\
android.widget.cts.TextViewTest
Change-Id: I772ade08ed26efac05ca56cb7df8cfec0327633b
2017-04-10 09:56:32 +00:00
Lorenzo Colitti
1e03739166
resolve merge conflicts of edb6946bd1 to oc-dev-plus-aosp
...
am: 419aec6c3c
2017-04-10 07:24:36 +00:00
Lorenzo Colitti
419aec6c3c
resolve merge conflicts of edb6946bd1 to oc-dev-plus-aosp
...
Test: make -j64 framework services
Change-Id: Ia87be346703637ebcb88bcf39d7e8c3c71db44ab
2017-04-10 16:13:56 +09:00
Hugo Benichi
21a006bdb4
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am: b2adaad26b -s ours am: f294973f6c -s ours am: dde60ac16d -s ours
...
am: 0a782794d1
2017-04-10 06:11:30 +00:00
Hugo Benichi
0a782794d1
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am: b2adaad26b -s ours am: f294973f6c -s ours
...
am: dde60ac16d
2017-04-10 06:01:57 +00:00
Lorenzo Colitti
edb6946bd1
Merge "Add an API hint for metered multipath traffic." am: 7a12f7efc7
...
am: 0ad718aab1
2017-04-10 05:54:10 +00:00
Hugo Benichi
dde60ac16d
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am: b2adaad26b -s ours
...
am: f294973f6c
2017-04-10 05:52:51 +00:00
Lorenzo Colitti
0ad718aab1
Merge "Add an API hint for metered multipath traffic."
...
am: 7a12f7efc7
2017-04-10 05:48:34 +00:00
Hugo Benichi
f294973f6c
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
...
am: b2adaad26b
2017-04-10 05:43:43 +00:00
Treehugger Robot
7a12f7efc7
Merge "Add an API hint for metered multipath traffic."
2017-04-10 05:40:10 +00:00
Treehugger Robot
b2adaad26b
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
2017-04-10 05:33:48 +00:00
Hugo Benichi
fa0dadc540
DO NOT MERGE IP connectivity metrics: fix tests.
...
This patch fixes mismatch between current proto compiler and what is
expected in several IP connectivity metrics unit tests.
Test: built, flashed, $ runtest frameworks-net
Bug: 37126521
Change-Id: I1476c923d61f748ecac1146423127f54ba117502
2017-04-10 13:19:23 +09:00
Hugo Benichi
ada3f6b8f1
Merge "Improve utility of IntArray and LongArray" am: 35786735df am: e718797a37 am: 4ca1cb7c10
...
am: 6f75cb52e8
2017-04-10 01:46:36 +00:00
Hugo Benichi
6f75cb52e8
Merge "Improve utility of IntArray and LongArray" am: 35786735df am: e718797a37
...
am: 4ca1cb7c10
2017-04-10 01:36:20 +00:00
Hugo Benichi
4ca1cb7c10
Merge "Improve utility of IntArray and LongArray" am: 35786735df
...
am: e718797a37
2017-04-10 01:26:49 +00:00
Hugo Benichi
e718797a37
Merge "Improve utility of IntArray and LongArray"
...
am: 35786735df
2017-04-10 01:17:42 +00:00
Hugo Benichi
35786735df
Merge "Improve utility of IntArray and LongArray"
2017-04-10 01:09:04 +00:00
Bookatz
b57d1d7fd2
Merge "Fix counting problems in StopwatchTimer." into oc-dev am: eca0d421d1
...
am: 7b6128e54b
2017-04-09 19:11:28 +00:00
