Adrian Roos
dfe01b5ff0
Merge \"Fix navigation bar order in seascape\" into nyc-mr1-dev
...
am: e2104afeba
2016-07-13 14:35:51 +00:00
Adrian Roos
e2104afeba
Merge "Fix navigation bar order in seascape" into nyc-mr1-dev
2016-07-13 14:31:32 +00:00
Mahaver Chopra
e64f60a455
Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev
...
am: 695a1c50a2
2016-07-13 12:33:59 +00:00
Mahaver Chopra
695a1c50a2
Merge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into nyc-mr1-dev
2016-07-13 12:27:01 +00:00
Zak Cohen
ee2f46485e
Merge \"Adds a screenshot wallpaper method to WallpaperManagerService.\" into nyc-mr1-dev
...
am: b4d4ce31ab
2016-07-13 10:22:02 +00:00
Zak Cohen
b4d4ce31ab
Merge "Adds a screenshot wallpaper method to WallpaperManagerService." into nyc-mr1-dev
2016-07-13 10:15:02 +00:00
Erik Kline
5b429166fc
Add IPv6 tethering coordinator
...
am: 1eb8c69bed
2016-07-13 04:57:17 +00:00
Jaewan Kim
a651320c8e
Fix build
...
It's caused by my previous CL
6bd036378120b0
2016-07-13 12:46:00 +09:00
Erik Kline
1eb8c69bed
Add IPv6 tethering coordinator
...
Add an IPv6TetheringCoordinator to TetheringMaster StateMachine, which
receives and processes NetworkState updates and passes the necessary IPv6
information to the revelant TetherInterfaceStateMachine.
Add an IPv6TetheringInterfaceServices to TetherInterfaceStateMachine, which
is responsible for adding local network routes and managing an IPv6
RouterAdvertisementDaemon.
Bug: 9580643
Change-Id: I3eaae460b80752e2115359d7bde873a1e9ea515a
2016-07-13 12:08:06 +09:00
Andrii Kulian
082cab4bb4
Merge \"Don\'t make redundant launch while updating configuration\" into nyc-mr1-dev
...
am: 4c7b339411
2016-07-13 02:32:44 +00:00
Andrii Kulian
4c7b339411
Merge "Don't make redundant launch while updating configuration" into nyc-mr1-dev
2016-07-13 02:20:12 +00:00
Chris Thornton
1a4507cb8e
Merge \"Fix a few log messages that didn\'t have a space in the SoundTriggerTestApp\" into nyc-mr1-dev
...
am: ea7999dc3f
2016-07-13 02:09:12 +00:00
Wei Jia
47efffff85
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
...
am: e7982e05f6
2016-07-13 02:09:07 +00:00
Adrian Roos
1642d8df0d
Merge \"Allow LockPatternUtils usage on non-looper threads\" into nyc-mr1-dev
...
am: feaa2bfb39
2016-07-13 02:09:03 +00:00
Robert Carr
11cfba59eb
Merge \"When display is frozen prefer preserving orientation.\" into nyc-mr1-dev
...
am: b6a77f4786
2016-07-13 02:08:58 +00:00
Ben Lin
64f4868803
Merge \"Trapping backspace at EditText level to prevent popping Docs.\" into nyc-mr1-dev
...
am: 2df618f4cd
2016-07-13 02:08:54 +00:00
Jaewan Kim
6bd036374c
resolve merge conflicts of 78120b0 to nyc-mr1-dev-plus-aosp
2016-07-13 10:55:06 +09:00
TreeHugger Robot
ea7999dc3f
Merge "Fix a few log messages that didn't have a space in the SoundTriggerTestApp" into nyc-mr1-dev
2016-07-13 01:54:08 +00:00
Wei Jia
e7982e05f6
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev
2016-07-13 01:48:09 +00:00
Adrian Roos
feaa2bfb39
Merge "Allow LockPatternUtils usage on non-looper threads" into nyc-mr1-dev
2016-07-13 01:41:16 +00:00
Rob Carr
b6a77f4786
Merge "When display is frozen prefer preserving orientation." into nyc-mr1-dev
2016-07-13 01:37:47 +00:00
TreeHugger Robot
2df618f4cd
Merge "Trapping backspace at EditText level to prevent popping Docs." into nyc-mr1-dev
2016-07-13 01:26:51 +00:00
Android Build Merger (Role)
0d7175f59e
Merge "Merge \\"docs: fix redirects for shareables\\" into nyc-dev am: e181729b18 am: 2364699d3a" into nyc-mr1-dev-plus-aosp
2016-07-13 00:56:52 +00:00
Joe Fernandez
168e1608a9
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am: e181729b18
...
am: 2364699d3a
2016-07-13 00:56:24 +00:00
Joe Fernandez
1ca81a8d23
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am: e181729b18
...
am: b85297a182
2016-07-13 00:55:46 +00:00
Damien Bargiacchi
c1c895b573
Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev
...
am: 4786f6d958
2016-07-13 00:51:43 +00:00
Jaewan Kim
78120b0177
Merge "MediaSessionService: Support managed profile" into nyc-mr1-dev
2016-07-13 00:46:07 +00:00
Joe Fernandez
2364699d3a
Merge \"docs: fix redirects for shareables\" into nyc-dev
...
am: e181729b18
2016-07-13 00:45:10 +00:00
Joe Fernandez
b85297a182
Merge \"docs: fix redirects for shareables\" into nyc-dev
...
am: e181729b18
2016-07-13 00:44:36 +00:00
Damien Bargiacchi
4786f6d958
Merge "Don't show times before 2000-01-01" into nyc-mr1-dev
2016-07-13 00:40:07 +00:00
Joe Fernandez
e181729b18
Merge "docs: fix redirects for shareables" into nyc-dev
2016-07-13 00:37:12 +00:00
David Christie
ee448e78af
Merge \"Fix issue where GnssMeasurements wouldn\'t allow empty measurements.\" into nyc-mr1-dev
...
am: 6441738f45
2016-07-13 00:31:53 +00:00
Kevin Gabayan
ef759ca10e
Merge \"Wakelock timeout for AnyMotionDetector. Bug: 29959125\" into nyc-mr1-dev
...
am: 33759a993d
2016-07-13 00:27:14 +00:00
David Christie
6441738f45
Merge "Fix issue where GnssMeasurements wouldn't allow empty measurements." into nyc-mr1-dev
2016-07-13 00:21:20 +00:00
Android Build Merger (Role)
f7d96e5557
Merge "Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 8496bb82d2" into nyc-mr1-dev-plus-aosp
2016-07-13 00:18:23 +00:00
Vladislav Kaznacheev
e13ac1898c
Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53
...
am: 8496bb82d2
2016-07-13 00:18:00 +00:00
Vladislav Kaznacheev
9c225d60e0
Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53
...
am: 9ac6a460c8
2016-07-13 00:17:39 +00:00
Chris Thornton
2d2ba9d089
Fix a few log messages that didn't have a space in the SoundTriggerTestApp
...
Change-Id: If3b5ac6533429843d4be733bd31f2bb83e1d5971
2016-07-12 17:16:42 -07:00
Kevin Gabayan
33759a993d
Merge "Wakelock timeout for AnyMotionDetector. Bug: 29959125" into nyc-mr1-dev
2016-07-13 00:14:22 +00:00
Joe Fernandez
e4acdc5f36
docs: fix redirects for shareables
...
b/30037099
Change-Id: I201b428d156a7f3eb49d92c6f5539b8f2c1998bb
2016-07-12 17:13:55 -07:00
Wei Jia
a03dc2b5eb
MediaDataSource: add DrmInitialization for IDataSource.
...
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
2016-07-13 00:11:36 +00:00
Andrii Kulian
db3e4ecf86
Don't make redundant launch while updating configuration
...
If the configuration changed the same time when the app was launched,
from ActivityStackSupervisor#realStartActivityLocked we updated
configuration, which lead to resuming top activity in focused stack.
This caused second redundant launch of already launching activity.
Bug: 29516875
Change-Id: I2babe1936dfb53b5a440deee34874731913db2eb
2016-07-12 17:11:35 -07:00
Vladislav Kaznacheev
8496bb82d2
Fix docs for View.DRAG_FLAG_GLOBAL
...
am: 9a44eaec53
2016-07-13 00:08:52 +00:00
Vladislav Kaznacheev
9ac6a460c8
Fix docs for View.DRAG_FLAG_GLOBAL
...
am: 9a44eaec53
2016-07-13 00:08:50 +00:00
Kevin Gabayan
dcf4701d37
Wakelock timeout for AnyMotionDetector.
...
Bug: 29959125
Change-Id: I7260fd1640b87884bb550ff428eb9cd1dc111512
2016-07-12 16:46:11 -07:00
Ben Lin
d9ba201f59
Trapping backspace at EditText level to prevent popping Docs.
...
When the EditText is empty, pressing backspace on soft/hardware keyboard
will call on the EditText's OnKeyListener. Since we don't handle
backspace, it will then bubble up to Activity-level, which will then pop
the document stack due to the feature of using backspace as navigation.
This will trap the call correctly if the EditText is empty.
Bug: 30066261
2016-07-12 23:42:56 +00:00
Dianne Hackborn
aa055e7f2d
Merge \"Fix issue #30013670 : Phone AP crash when testing VT call\" into nyc-mr1-dev
...
am: ab1b52a0c4
2016-07-12 23:37:25 +00:00
Chris Thornton
0359337b9b
Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev
...
am: 9b550cb188
2016-07-12 23:37:18 +00:00
Fyodor Kupolov
6d2170ee5d
Merge \"Move grantDefaultPermissions back to onNewUserCreated\" into nyc-mr1-dev
...
am: 9cf5bf04d2
2016-07-12 23:37:08 +00:00
Dianne Hackborn
ab1b52a0c4
Merge "Fix issue #30013670 : Phone AP crash when testing VT call" into nyc-mr1-dev
2016-07-12 23:28:38 +00:00
