OSDN Git Service
Mikhail Naganov [Fri, 8 Jul 2016 20:26:19 +0000 (13:26 -0700)]
Protect MIDI framework against client blocks in MidiReceiver.onSend
Make the server-side socket non-blocking when creating MidiOutputPort
for clients. Thus if a client ceases to read from its side of the
socket pair, the server will just fail to write instead of blocking.
One drawback is that the MidiOutputPort on the client can't indicate
that it has become dysfunctional, but it's not possible without
changing the API.
Bug:
29413812
Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a
Ruben Brunk [Wed, 13 Jul 2016 19:11:49 +0000 (19:11 +0000)]
Merge \\"Include all components in VR initialization.\\" into nyc-mr1-dev am:
0b4750165e
am:
d92b174f01
Change-Id: I967d7a4db93ca4d5be4998a866aa51ffbb67c611
Ruben Brunk [Wed, 13 Jul 2016 19:06:21 +0000 (19:06 +0000)]
Merge \"Include all components in VR initialization.\" into nyc-mr1-dev
am:
0b4750165e
Change-Id: I33a82666674e5bbc2d0e85480c60b3bd4595264e
Ruben Brunk [Wed, 13 Jul 2016 19:02:25 +0000 (19:02 +0000)]
Merge "Include all components in VR initialization." into nyc-mr1-dev
Julia Reynolds [Wed, 13 Jul 2016 18:58:20 +0000 (18:58 +0000)]
Merge \\"Whitelist default apps for DND access.\\" into nyc-mr1-dev am:
5bd9ea82d2
am:
e1f91a7475
Change-Id: I3924cd2b30d6d437fc763f55ccd5fc95e6befc72
Julia Reynolds [Wed, 13 Jul 2016 18:47:12 +0000 (18:47 +0000)]
Merge \"Whitelist default apps for DND access.\" into nyc-mr1-dev
am:
5bd9ea82d2
Change-Id: I95d832e2858668cd5b0f6a7686ccda0cd420b726
Victor Chang [Wed, 13 Jul 2016 18:47:10 +0000 (18:47 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-mr1-dev am:
e05b35db0d
am:
87ec0ef5e2
Change-Id: Ib6ed82c6e9e48cb7f08cfca194331796c5cdd5ba
Victor Chang [Wed, 13 Jul 2016 18:40:49 +0000 (18:40 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-mr1-dev
am:
e05b35db0d
Change-Id: I0b47bc6184ee3b4b9ac4783decf4c8cd30b70fbd
Julia Reynolds [Wed, 13 Jul 2016 18:40:20 +0000 (18:40 +0000)]
Merge "Whitelist default apps for DND access." into nyc-mr1-dev
Victor Chang [Wed, 13 Jul 2016 18:36:35 +0000 (18:36 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-mr1-dev
Kevin Hufnagle [Wed, 13 Jul 2016 18:24:36 +0000 (18:24 +0000)]
Merge \\\"docs: Added \\\"developer stories\\\" articles.\\\" into nyc-dev am:
686996d2dc am:
0265530bda
am:
3ddb70c9e7
Change-Id: I9877f6c3638e7cc3d7c470ec01018a7ddd026218
Kevin Hufnagle [Wed, 13 Jul 2016 18:17:07 +0000 (18:17 +0000)]
Merge \\\"docs: Added \\\"developer stories\\\" articles.\\\" into nyc-dev am:
686996d2dc am:
7a9e9d5a3e
am:
57113a0744
Change-Id: I41c73a034e3681e0bd8efa8a2758c0d8952fb676
Kevin Hufnagle [Wed, 13 Jul 2016 18:14:59 +0000 (18:14 +0000)]
Merge \\"docs: Added \\"developer stories\\" articles.\\" into nyc-dev am:
686996d2dc
am:
0265530bda
Change-Id: I1768ff2ed66bcdf36382b0a222e7cefb86f7e5fa
Kevin Hufnagle [Wed, 13 Jul 2016 18:12:05 +0000 (18:12 +0000)]
Merge \\"docs: Added \\"developer stories\\" articles.\\" into nyc-dev am:
686996d2dc
am:
7a9e9d5a3e
Change-Id: Iedea98bdb320c9dd6532c447f340de0756b4b69c
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:49 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: Ib6470cf466c655d97000b23bd5f7e6f485152d02
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:44 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: I7a01c6f743c05c36c37eb5b742aaf756d13b9898
TreeHugger Robot [Wed, 13 Jul 2016 18:06:25 +0000 (18:06 +0000)]
Merge "Rename WindowState.mAttachedWindow to WindowState.mParentWindow"
Kevin Hufnagle [Wed, 13 Jul 2016 17:52:24 +0000 (17:52 +0000)]
Merge "docs: Added "developer stories" articles." into nyc-dev
Tenghui Zhu [Wed, 13 Jul 2016 17:47:20 +0000 (17:47 +0000)]
Merge "Double check the layout test running on UI thread"
Makoto Onuki [Wed, 13 Jul 2016 17:34:11 +0000 (17:34 +0000)]
Merge \\"Revert \\"Revert \\"Handle package broadcasts before apps do\\"\\"\\" into nyc-mr1-dev am:
98802f6007
am:
80dd14e061
Change-Id: I32fcfdc3fb90fe7b0ac14239a721769234c7cb2f
Makoto Onuki [Wed, 13 Jul 2016 17:18:16 +0000 (17:18 +0000)]
Merge \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\" into nyc-mr1-dev
am:
98802f6007
Change-Id: I51e9cedb8cba67b987f8ed6b92bcf66082594990
Adrian Roos [Wed, 13 Jul 2016 17:16:03 +0000 (17:16 +0000)]
Merge \\"Suppress immersive mode confirmation if navbar is empty\\" into nyc-mr1-dev am:
2061ff11c4
am:
2149506068
Change-Id: Ia637f2f45fe31778b2eabd2719cd6de0af27f1f6
Adrian Roos [Wed, 13 Jul 2016 17:10:11 +0000 (17:10 +0000)]
Merge \"Suppress immersive mode confirmation if navbar is empty\" into nyc-mr1-dev
am:
2061ff11c4
Change-Id: I512dbe859db4da3690016f3ea52a872b6c7b5147
Makoto Onuki [Wed, 13 Jul 2016 17:09:36 +0000 (17:09 +0000)]
Merge "Revert "Revert "Handle package broadcasts before apps do""" into nyc-mr1-dev
Usman Abdullah [Wed, 13 Jul 2016 17:09:34 +0000 (17:09 +0000)]
Merge \\"Grant Camera Permissions to DialerPackage\\" into nyc-mr1-dev am:
7280e66e04
am:
27fe9402ff
Change-Id: Iaa719ce6500eaffb0889e70c3f10f668e303693f
Makoto Onuki [Wed, 13 Jul 2016 17:08:26 +0000 (17:08 +0000)]
Revert "Revert "Handle package broadcasts before apps do""
This reverts commit
efbbe7ea9db8adab6bff407db1d7fc54bbaf31ee.
Change-Id: I3dbb080db5121307f533a7d411f4f5d47225500e
Adrian Roos [Wed, 13 Jul 2016 17:02:46 +0000 (17:02 +0000)]
Merge "Suppress immersive mode confirmation if navbar is empty" into nyc-mr1-dev
Usman Abdullah [Wed, 13 Jul 2016 16:58:06 +0000 (16:58 +0000)]
Merge \"Grant Camera Permissions to DialerPackage\" into nyc-mr1-dev
am:
7280e66e04
Change-Id: I4a914460a950cfcdf481e215b4a260d06f1b9c00
Makoto Onuki [Wed, 13 Jul 2016 16:58:06 +0000 (16:58 +0000)]
Merge \\"Revert \\"Handle package broadcasts before apps do\\"\\" into nyc-mr1-dev am:
7f3187bb0d
am:
5f18bbe034
Change-Id: I05af5e8eb457c19e3dbce414e0e2351c936703ff
Daniel Nishi [Wed, 13 Jul 2016 16:47:22 +0000 (16:47 +0000)]
Merge \\"Add a constant for when the storage manager is toggled on and off.\\" into nyc-mr1-dev am:
b5bb9f5ca7
am:
3d38bbb7c3
Change-Id: I76340654ee6904b4f02326b4242eaacf7ee5bf49
Makoto Onuki [Wed, 13 Jul 2016 16:47:11 +0000 (16:47 +0000)]
Merge \"Revert \"Handle package broadcasts before apps do\"\" into nyc-mr1-dev
am:
7f3187bb0d
Change-Id: I15a7629138e1c0b44620bd6239d7a14d3df14b82
Julia Reynolds [Mon, 11 Jul 2016 12:50:58 +0000 (08:50 -0400)]
Whitelist default apps for DND access.
Bug:
29606962
Change-Id: I0a94004cf08a51ab17813f99aabddbceb95ac8f0
Usman Abdullah [Wed, 13 Jul 2016 16:39:10 +0000 (16:39 +0000)]
Merge "Grant Camera Permissions to DialerPackage" into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 16:35:30 +0000 (16:35 +0000)]
Merge \"Add a constant for when the storage manager is toggled on and off.\" into nyc-mr1-dev
am:
b5bb9f5ca7
Change-Id: I526918b546960dfe62e7f22b09f7883614daed32
Makoto Onuki [Wed, 13 Jul 2016 16:33:38 +0000 (16:33 +0000)]
Merge "Revert "Handle package broadcasts before apps do"" into nyc-mr1-dev
Wale Ogunwale [Sat, 9 Jul 2016 22:28:55 +0000 (15:28 -0700)]
Rename WindowState.mAttachedWindow to WindowState.mParentWindow
Helps with code clarity and reduces confusion for upcoming WM
object modeling changes.
Also, along the same lines changes locations that check to see if
WS.mAttachedWindow wasn't null to determine if the window is a child
window to use WS.isChildWindow method instead.
Bug:
30060889
Change-Id: I9b975ab9ff9bf09cdd3c0dcaddd3bf9232e88be8
Daniel Nishi [Wed, 13 Jul 2016 16:26:04 +0000 (16:26 +0000)]
Merge "Add a constant for when the storage manager is toggled on and off." into nyc-mr1-dev
Etan Cohen [Wed, 13 Jul 2016 16:14:44 +0000 (16:14 +0000)]
[NAN] Fix assumption about Strings containing single-byte characters.
am:
9a6161c61c
Change-Id: Id761eede5692131a9ca47497f03c088c6a0cc492
Eric Laurent [Wed, 13 Jul 2016 16:06:14 +0000 (16:06 +0000)]
Merge \\"Make Dolby TrueHD audio format public\\" into nyc-mr1-dev am:
eb8de29269
am:
50768af5e1
Change-Id: Id634ea390d59dc0f39b3ce1b5ce440f6aad54634
Eric Laurent [Wed, 13 Jul 2016 16:01:29 +0000 (16:01 +0000)]
Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev
am:
eb8de29269
Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
Eric Laurent [Wed, 13 Jul 2016 15:54:02 +0000 (15:54 +0000)]
Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev
Julia Reynolds [Wed, 13 Jul 2016 15:41:55 +0000 (15:41 +0000)]
Merge \\"Attribute manual zen mode in volume panel footer.\\" into nyc-mr1-dev am:
f6d766020f
am:
c2381727a7
Change-Id: Ibb38d3a68dd642b5d6507341b7e189b77bba9502
Julia Reynolds [Wed, 13 Jul 2016 15:33:36 +0000 (15:33 +0000)]
Merge \"Attribute manual zen mode in volume panel footer.\" into nyc-mr1-dev
am:
f6d766020f
Change-Id: I89ee22c5304e7de651aa34bddf5635f2e87e6b01
Julia Reynolds [Wed, 13 Jul 2016 15:26:01 +0000 (15:26 +0000)]
Merge "Attribute manual zen mode in volume panel footer." into nyc-mr1-dev
Victor Chang [Tue, 12 Jul 2016 22:47:29 +0000 (23:47 +0100)]
Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set
Fix:
29899712
Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943
Benjamin Franz [Wed, 13 Jul 2016 14:42:22 +0000 (14:42 +0000)]
Merge \\"Add hidden API to store whether provisioning config has been applied\\" into nyc-mr1-dev am:
17ca90430b
am:
b3fa8d87e0
Change-Id: If65317cf6ec5237cff36fba86ed219ab078776ad
Adrian Roos [Wed, 13 Jul 2016 14:42:19 +0000 (14:42 +0000)]
Merge \\"Fix navigation bar order in seascape\\" into nyc-mr1-dev am:
e2104afeba
am:
dfe01b5ff0
Change-Id: Ic00b8027974173128061d2e4875970ae8c31de5c
Benjamin Franz [Wed, 13 Jul 2016 14:35:59 +0000 (14:35 +0000)]
Merge \"Add hidden API to store whether provisioning config has been applied\" into nyc-mr1-dev
am:
17ca90430b
Change-Id: Ibd92d09022e534df20405af19763d1156f797b4e
Adrian Roos [Wed, 13 Jul 2016 14:35:51 +0000 (14:35 +0000)]
Merge \"Fix navigation bar order in seascape\" into nyc-mr1-dev
am:
e2104afeba
Change-Id: Iabdc18a01a88c14b664459fc2afbf5d68e9068a9
Benjamin Franz [Wed, 13 Jul 2016 14:31:49 +0000 (14:31 +0000)]
Merge "Add hidden API to store whether provisioning config has been applied" into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 14:31:31 +0000 (14:31 +0000)]
Merge "Fix navigation bar order in seascape" into nyc-mr1-dev
Etan Cohen [Wed, 13 Jul 2016 14:29:00 +0000 (14:29 +0000)]
[NAN] NAN data-path API: network specifier
am:
15849dc463
Change-Id: I406276385708a3577393f5532cdf652b0d739302
Julia Reynolds [Wed, 6 Jul 2016 13:47:45 +0000 (09:47 -0400)]
Attribute manual zen mode in volume panel footer.
So users know what app enabled DND.
Change-Id: I0aad862539b28302bf618641ad29cdfa956c8f33
Fixes:
29892371
Mahaver Chopra [Wed, 13 Jul 2016 12:41:16 +0000 (12:41 +0000)]
Merge \\"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\\" into nyc-mr1-dev am:
695a1c50a2
am:
e64f60a455
Change-Id: Iedc9544179d3c3de8616375e51f7a60ddd1c8c3b
Mahaver Chopra [Wed, 13 Jul 2016 12:33:59 +0000 (12:33 +0000)]
Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev
am:
695a1c50a2
Change-Id: I8976511deb994983abbb17b2830b98878c92631b
Mahaver Chopra [Wed, 13 Jul 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into nyc-mr1-dev
Zak Cohen [Wed, 13 Jul 2016 10:26:47 +0000 (10:26 +0000)]
Merge \\"Adds a screenshot wallpaper method to WallpaperManagerService.\\" into nyc-mr1-dev am:
b4d4ce31ab
am:
ee2f46485e
Change-Id: Ia7b738db6f73c89e97537f9b1c0d5cb7fd161616
Zak Cohen [Wed, 13 Jul 2016 10:22:02 +0000 (10:22 +0000)]
Merge \"Adds a screenshot wallpaper method to WallpaperManagerService.\" into nyc-mr1-dev
am:
b4d4ce31ab
Change-Id: I4737e4d758335240614d2d2b51c11b8c739160fc
Zak Cohen [Wed, 13 Jul 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Adds a screenshot wallpaper method to WallpaperManagerService." into nyc-mr1-dev
Jin Park [Tue, 5 Jul 2016 00:43:37 +0000 (09:43 +0900)]
ExifInterface: Add RAF file parse support
A RAF format file has a unique way of storing its data. This CL adds
code that checks whether a file is a RAF file format and parses the
data according to specifications.
Bug:
29409358
Change-Id: If37d4ba8de47cdbacd524a07148ba6c14f873259
Jin Seok Park [Wed, 13 Jul 2016 07:08:53 +0000 (07:08 +0000)]
Merge "ExifInterface: Extract primary image length/width values"
Jin Park [Tue, 5 Jul 2016 08:00:52 +0000 (17:00 +0900)]
ExifInterface: Extract primary image length/width values
The primary image may not contain the tags for ImageLength and
ImageWidth values if it uses the JFIF specification. This CL searches
the data to retrieve those necessary values.
Bug:
29409358
Change-Id: I850768af38b7b723e93833a70a2238f3fe1cc29b
Erik Kline [Wed, 13 Jul 2016 05:02:13 +0000 (05:02 +0000)]
Add IPv6 tethering coordinator am:
1eb8c69bed
am:
5b429166fc
Change-Id: I9a5bd7d72ec6a4b63922fc5704d15cb5eafc1e8d
Erik Kline [Wed, 13 Jul 2016 04:57:17 +0000 (04:57 +0000)]
Add IPv6 tethering coordinator
am:
1eb8c69bed
Change-Id: Icf8034276d4edc7167ad03ff8860ac8e3d05c464
Jaewan Kim [Wed, 13 Jul 2016 04:08:49 +0000 (04:08 +0000)]
Fix build
am:
a651320c8e
Change-Id: I9877c5e1d501b84d7fdf48d1582b165a27d0d3ee
Jaewan Kim [Wed, 13 Jul 2016 03:46:00 +0000 (12:46 +0900)]
Fix build
It's caused by my previous CL
6bd0363 resolve merge conflicts of
78120b0 to nyc-mr1-dev-plus-aosp
Change-Id: I57124b229945ebda3ea7a2fb6103e928cd9fd945
Erik Kline [Fri, 8 Jul 2016 08:21:26 +0000 (17:21 +0900)]
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
Andrii Kulian [Wed, 13 Jul 2016 02:37:02 +0000 (02:37 +0000)]
Merge \\"Don\\'t make redundant launch while updating configuration\\" into nyc-mr1-dev am:
4c7b339411
am:
082cab4bb4
Change-Id: I33a09d4a35d36707e155eb56ca53bab79f31af06
Andrii Kulian [Wed, 13 Jul 2016 02:32:44 +0000 (02:32 +0000)]
Merge \"Don\'t make redundant launch while updating configuration\" into nyc-mr1-dev
am:
4c7b339411
Change-Id: I84bce1a3980bf78eb20f7473b4cee687481d8bf2
Andrii Kulian [Wed, 13 Jul 2016 02:20:11 +0000 (02:20 +0000)]
Merge "Don't make redundant launch while updating configuration" into nyc-mr1-dev
Chris Thornton [Wed, 13 Jul 2016 02:15:44 +0000 (02:15 +0000)]
Merge \\"Fix a few log messages that didn\\'t have a space in the SoundTriggerTestApp\\" into nyc-mr1-dev am:
ea7999dc3f
am:
1a4507cb8e
Change-Id: I4579b7ecd4781d56cc86878d8c145aa11e56ea81
Wei Jia [Wed, 13 Jul 2016 02:15:42 +0000 (02:15 +0000)]
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-mr1-dev am:
e7982e05f6
am:
47efffff85
Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e
Adrian Roos [Wed, 13 Jul 2016 02:15:39 +0000 (02:15 +0000)]
Merge \\"Allow LockPatternUtils usage on non-looper threads\\" into nyc-mr1-dev am:
feaa2bfb39
am:
1642d8df0d
Change-Id: I0bfc272cef3cee1e76f1b3bc5f8f0908bd24f2e5
Rob Carr [Wed, 13 Jul 2016 02:15:37 +0000 (02:15 +0000)]
Merge \\"When display is frozen prefer preserving orientation.\\" into nyc-mr1-dev am:
b6a77f4786
am:
11cfba59eb
Change-Id: I18be206e0baf4530a7289c4c0522dabf2883f29b
Ben Lin [Wed, 13 Jul 2016 02:15:34 +0000 (02:15 +0000)]
Merge \\"Trapping backspace at EditText level to prevent popping Docs.\\" into nyc-mr1-dev am:
2df618f4cd
am:
64f4868803
Change-Id: I622f74b03dd3e201f3000b926571352a55ae10e9
Jaewan Kim [Wed, 13 Jul 2016 02:09:56 +0000 (02:09 +0000)]
resolve merge conflicts of
78120b0 to nyc-mr1-dev-plus-aosp
am:
6bd036374c
Change-Id: I9d8a1e834305dd508c5d81881b5cbe5464f43fea
Chris Thornton [Wed, 13 Jul 2016 02:09:12 +0000 (02:09 +0000)]
Merge \"Fix a few log messages that didn\'t have a space in the SoundTriggerTestApp\" into nyc-mr1-dev
am:
ea7999dc3f
Change-Id: I27952804de098e92c50907d47198dd747f272e31
Wei Jia [Wed, 13 Jul 2016 02:09:07 +0000 (02:09 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
am:
e7982e05f6
Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2
Adrian Roos [Wed, 13 Jul 2016 02:09:03 +0000 (02:09 +0000)]
Merge \"Allow LockPatternUtils usage on non-looper threads\" into nyc-mr1-dev
am:
feaa2bfb39
Change-Id: I22afcc4e7307e3c64a92fdcef82f2d1344fbb5df
Robert Carr [Wed, 13 Jul 2016 02:08:58 +0000 (02:08 +0000)]
Merge \"When display is frozen prefer preserving orientation.\" into nyc-mr1-dev
am:
b6a77f4786
Change-Id: I08c34d4dd87ae9503337336a103cc048034bf4a2
Ben Lin [Wed, 13 Jul 2016 02:08:54 +0000 (02:08 +0000)]
Merge \"Trapping backspace at EditText level to prevent popping Docs.\" into nyc-mr1-dev
am:
2df618f4cd
Change-Id: I2f8a3c1d0c0c6a017e212288458429627f7c7544
Jaewan Kim [Wed, 13 Jul 2016 01:55:06 +0000 (10:55 +0900)]
resolve merge conflicts of
78120b0 to nyc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 13 Jul 2016 01:54:06 +0000 (01:54 +0000)]
Merge "Fix a few log messages that didn't have a space in the SoundTriggerTestApp" into nyc-mr1-dev
Wei Jia [Wed, 13 Jul 2016 01:48:07 +0000 (01:48 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 01:41:15 +0000 (01:41 +0000)]
Merge "Allow LockPatternUtils usage on non-looper threads" into nyc-mr1-dev
Rob Carr [Wed, 13 Jul 2016 01:37:46 +0000 (01:37 +0000)]
Merge "When display is frozen prefer preserving orientation." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 01:26:50 +0000 (01:26 +0000)]
Merge "Trapping backspace at EditText level to prevent popping Docs." into nyc-mr1-dev
Joe Fernandez [Wed, 13 Jul 2016 01:01:39 +0000 (01:01 +0000)]
Merge \"Merge \\\"docs: fix redirects for shareables\\\" into nyc-dev am:
e181729b18 am:
2364699d3a\" into nyc-mr1-dev-plus-aosp
am:
0d7175f59e
Change-Id: I7391e1fdc96da1b7913c8410c0116ec69d67bfdf
Joe Fernandez [Wed, 13 Jul 2016 01:01:33 +0000 (01:01 +0000)]
Merge \\\"docs: fix redirects for shareables\\\" into nyc-dev am:
e181729b18 am:
b85297a182
am:
1ca81a8d23
Change-Id: If303259b71a6ce41df584b79233db86718a3c281
Damien Bargiacchi [Wed, 13 Jul 2016 01:01:26 +0000 (01:01 +0000)]
Merge \\"Don\\'t show times before 2000-01-01\\" into nyc-mr1-dev am:
4786f6d958
am:
c1c895b573
Change-Id: I00c20f3b012a6f183b74f5836af62de9bae7a466
Android Build Merger (Role) [Wed, 13 Jul 2016 00:56:51 +0000 (00:56 +0000)]
Merge "Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18 am:
2364699d3a" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Wed, 13 Jul 2016 00:56:24 +0000 (00:56 +0000)]
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18
am:
2364699d3a
Change-Id: I859889d921dc93b0984829275d79e43d8be46692
Joe Fernandez [Wed, 13 Jul 2016 00:55:46 +0000 (00:55 +0000)]
Merge \\"docs: fix redirects for shareables\\" into nyc-dev am:
e181729b18
am:
b85297a182
Change-Id: Ifcae023b83ca1caea496a53728bb2e6b03c00397
Damien Bargiacchi [Wed, 13 Jul 2016 00:51:43 +0000 (00:51 +0000)]
Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev
am:
4786f6d958
Change-Id: Ic0eb9edf0cc94f62d808e214e19c8003dc9a7941
Jaewan Kim [Wed, 13 Jul 2016 00:46:06 +0000 (00:46 +0000)]
Merge "MediaSessionService: Support managed profile" into nyc-mr1-dev
David Christie [Wed, 13 Jul 2016 00:45:10 +0000 (00:45 +0000)]
Merge \\"Fix issue where GnssMeasurements wouldn\\'t allow empty measurements.\\" into nyc-mr1-dev am:
6441738f45
am:
ee448e78af
Change-Id: I0d6fcc8d26523eabb924df2f9d47060bb1e6996d
Joe Fernandez [Wed, 13 Jul 2016 00:45:10 +0000 (00:45 +0000)]
Merge \"docs: fix redirects for shareables\" into nyc-dev
am:
e181729b18
Change-Id: I5aff432f11ac7af3d653a367a79c42cbb01547b6
Joe Fernandez [Wed, 13 Jul 2016 00:44:36 +0000 (00:44 +0000)]
Merge \"docs: fix redirects for shareables\" into nyc-dev
am:
e181729b18
Change-Id: Ifc0ca35213e38efa516e070b1bf42fb29536d338
Damien Bargiacchi [Wed, 13 Jul 2016 00:40:06 +0000 (00:40 +0000)]
Merge "Don't show times before 2000-01-01" into nyc-mr1-dev
Joe Fernandez [Wed, 13 Jul 2016 00:37:11 +0000 (00:37 +0000)]
Merge "docs: fix redirects for shareables" into nyc-dev
OSDN Git Service
