OSDN Git Service
Roozbeh Pournader [Wed, 12 Apr 2017 23:37:03 +0000 (23:37 +0000)]
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
am:
d39388219f
Change-Id: Icae3c9b7166b4b83b31ad08bcd78db2205c916c1
Roozbeh Pournader [Wed, 12 Apr 2017 23:22:33 +0000 (23:22 +0000)]
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
Rob Carr [Wed, 12 Apr 2017 23:03:12 +0000 (23:03 +0000)]
Merge "Fix auto-pip visibility issues." into oc-dev
am:
7040f573f3
Change-Id: I1ac9baf15ac5efc2262f4bcf6ba650b25d326ff9
Android Build Merger (Role) [Wed, 12 Apr 2017 23:00:06 +0000 (23:00 +0000)]
Merge "Merge changes from topic 'network_specifier' am:
d0f476bdae am:
362bef45d1 am:
cfd729093f" into oc-dev-plus-aosp
Lorenzo Colitti [Wed, 12 Apr 2017 22:58:42 +0000 (22:58 +0000)]
Merge changes from topic 'network_specifier' am:
d0f476bdae am:
362bef45d1
am:
cfd729093f
Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b
Jiaquan He [Wed, 12 Apr 2017 22:56:15 +0000 (22:56 +0000)]
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
am:
18d993bb72
Change-Id: Ic8d6df348c0c3908e32ae8dc288ee48b5a731163
Jiaquan He [Wed, 12 Apr 2017 22:54:17 +0000 (22:54 +0000)]
Draw a default focus highlight if needed.
am:
8062949ece
Change-Id: Ia06126f29168df05fe851746d86e15846ceca1b8
Jiaquan He [Wed, 12 Apr 2017 22:53:09 +0000 (22:53 +0000)]
Add a public API defaultFocusHighlightEnabled.
am:
b7daaf8b5f
Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
Jiaquan He [Wed, 12 Apr 2017 22:51:56 +0000 (22:51 +0000)]
Detect unhandled keyboard focused state.
am:
4a81674b45
Change-Id: I8c756acc96cab2d24c19f86c50266c2ef51b5494
Lorenzo Colitti [Wed, 12 Apr 2017 22:48:55 +0000 (22:48 +0000)]
Merge changes from topic 'network_specifier' am:
d0f476bdae
am:
362bef45d1
Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
Rob Carr [Wed, 12 Apr 2017 22:46:22 +0000 (22:46 +0000)]
Merge "Fix auto-pip visibility issues." into oc-dev
Lorenzo Colitti [Wed, 12 Apr 2017 22:43:03 +0000 (22:43 +0000)]
Merge changes from topic 'network_specifier'
am:
d0f476bdae
Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
TreeHugger Robot [Wed, 12 Apr 2017 22:40:06 +0000 (22:40 +0000)]
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
* changes:
Fix broken CTS tests.
Draw a default focus highlight if needed.
Add a public API defaultFocusHighlightEnabled.
Detect unhandled keyboard focused state.
Lorenzo Colitti [Wed, 12 Apr 2017 22:27:35 +0000 (22:27 +0000)]
Merge changes from topic 'network_specifier'
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Tony Mak [Wed, 12 Apr 2017 22:18:56 +0000 (22:18 +0000)]
Merge "clear calling identity before calling settings provider" into oc-dev
am:
c240c9b134
Change-Id: I7b45453ad9dc57ac6c3a9b83f20731f9dcfbf114
Amit Mahajan [Wed, 12 Apr 2017 22:13:42 +0000 (22:13 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev
am:
682ce66309
Change-Id: I877f9e817beabcf9786796fd5accf06b1dcb3f36
TreeHugger Robot [Wed, 12 Apr 2017 22:09:19 +0000 (22:09 +0000)]
Merge "clear calling identity before calling settings provider" into oc-dev
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 21:56:26 +0000 (21:56 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97 am:
d43127865b
am:
ce8de6c3f7
Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf
Dianne Hackborn [Wed, 12 Apr 2017 21:51:00 +0000 (21:51 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
am:
81bfe1f62e
Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
Jakub Pawlowski [Wed, 12 Apr 2017 21:45:52 +0000 (21:45 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97
am:
d43127865b
Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
Dianne Hackborn [Wed, 12 Apr 2017 21:37:47 +0000 (21:37 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 21:35:25 +0000 (21:35 +0000)]
Merge "Bluetooth 5 PHY simplification"
am:
a9acf9db97
Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
Android Build Merger (Role) [Wed, 12 Apr 2017 21:34:58 +0000 (21:34 +0000)]
Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 am:
f9197e0180 -s ours" into oc-dev-plus-aosp
Svet Ganov [Wed, 12 Apr 2017 21:34:02 +0000 (21:34 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553
am:
f9197e0180 -s ours
Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b
Android Build Merger (Role) [Wed, 12 Apr 2017 21:33:41 +0000 (21:33 +0000)]
Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b am:
f72b1104f3 -s ours" into oc-dev-plus-aosp
Julius D'souza [Wed, 12 Apr 2017 21:32:43 +0000 (21:32 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b
am:
f72b1104f3 -s ours
Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519
Svet Ganov [Wed, 12 Apr 2017 21:30:45 +0000 (21:30 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 -s ours
am:
84ec9cbace
Change-Id: I44899ea4d5c7a48d7168cb008db31f0b62b093be
Julius D'souza [Wed, 12 Apr 2017 21:29:50 +0000 (21:29 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b -s ours
am:
3a967f92f2
Change-Id: I925d8a6b9bfb9e3020fd3a5a01794f4cc0243be4
Svet Ganov [Wed, 12 Apr 2017 21:28:45 +0000 (21:28 +0000)]
Merge "Add autofill feature API" into oc-dev
am:
a402d6dd2f
Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
Dianne Hackborn [Wed, 12 Apr 2017 21:27:27 +0000 (21:27 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
am:
ad6ab44e15
Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
Makoto Onuki [Wed, 12 Apr 2017 21:26:08 +0000 (21:26 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
am:
b4c2e6f468
Change-Id: Ic8779cbe121fcc2108bc742a6a9f2be866c76df3
Jakub Pawlowski [Wed, 12 Apr 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Bluetooth 5 PHY simplification"
Svet Ganov [Wed, 12 Apr 2017 21:22:08 +0000 (21:22 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553
Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
Svet Ganov [Wed, 12 Apr 2017 21:21:56 +0000 (21:21 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553 -s ours
Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02
Dianne Hackborn [Wed, 12 Apr 2017 21:21:52 +0000 (21:21 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
am:
f74210c3a3
Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec
Julius D'souza [Wed, 12 Apr 2017 21:20:50 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b
Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
Julius D'souza [Wed, 12 Apr 2017 21:20:47 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b -s ours
Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f
Selim Gurun [Wed, 12 Apr 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
am:
c68b1a8aef
Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83
TreeHugger Robot [Wed, 12 Apr 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Add autofill feature API" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:11:58 +0000 (21:11 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368 am:
40cde7b71f
am:
36611a0958
Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am:
39c3d2cf16
Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
Dianne Hackborn [Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev
Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am:
0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
Makoto Onuki [Wed, 12 Apr 2017 21:10:32 +0000 (21:10 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 21:09:59 +0000 (21:09 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:06:20 +0000 (21:06 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368
am:
40cde7b71f
Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
Selim Gurun [Wed, 12 Apr 2017 21:05:03 +0000 (21:05 +0000)]
Merge "Deprecate findAddress() method" into oc-dev
Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "ECBM SystemProperty cleanup"
am:
4718606368
Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
Android Build Merger (Role) [Wed, 12 Apr 2017 20:54:56 +0000 (20:54 +0000)]
Merge changes from topic 'am-
e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6 am:
a237a34085
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d am:
99c50add4f
nharold [Wed, 12 Apr 2017 20:53:17 +0000 (20:53 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b am:
176bfb58c6
am:
a237a34085
Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Nathan Harold [Wed, 12 Apr 2017 20:51:41 +0000 (20:51 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d
am:
99c50add4f
Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
Jason Monk [Wed, 12 Apr 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Make QS light" into oc-dev
am:
755138bb1c
Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
TreeHugger Robot [Wed, 12 Apr 2017 20:43:13 +0000 (20:43 +0000)]
Merge "Make QS light" into oc-dev
Bill Yi [Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88ab6c1304 -s ours
Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc
Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Wed, 12 Apr 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
am:
e7b806e9d2
Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
Seigo Nonaka [Wed, 12 Apr 2017 19:55:52 +0000 (19:55 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am:
1e924df63e
Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a
Jesse Evans [Wed, 12 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am:
684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
Jaewan Kim [Wed, 12 Apr 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am:
e7ce1d40e1
Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 19:24:55 +0000 (19:24 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
am:
43dd3ba3c4
Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
Casey Burkhardt [Wed, 12 Apr 2017 19:14:04 +0000 (19:14 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am:
9aa64e6cfa
Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
Julia Reynolds [Wed, 12 Apr 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug:
36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit
8e9ea907448c49f573dd045707e37dd14efdf152)
Casey Burkhardt [Wed, 12 Apr 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
Svet Ganov [Wed, 12 Apr 2017 19:03:26 +0000 (19:03 +0000)]
Merge "Fill UI polish" into oc-dev
am:
c9a83326c2
Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
TreeHugger Robot [Wed, 12 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fill UI polish" into oc-dev
Kang Li [Wed, 12 Apr 2017 18:41:21 +0000 (18:41 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am:
1f477fb270
Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
Mady Mellor [Wed, 12 Apr 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
am:
8f395a16fb
Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
nharold [Wed, 12 Apr 2017 18:39:15 +0000 (18:39 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b
am:
176bfb58c6
Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
Nathan Harold [Wed, 12 Apr 2017 18:37:23 +0000 (18:37 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35
am:
9c2428ad4d
Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
Charles He [Wed, 12 Apr 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am:
9f074e2224
Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
TreeHugger Robot [Wed, 12 Apr 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
nharold [Wed, 12 Apr 2017 18:29:04 +0000 (18:29 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
am:
fddf677b8b
Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
Mady Mellor [Wed, 12 Apr 2017 18:27:23 +0000 (18:27 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
Nathan Harold [Wed, 12 Apr 2017 18:27:09 +0000 (18:27 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks
am:
6045429b35
Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
Bill Yi [Wed, 12 Apr 2017 18:26:14 +0000 (18:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2d1fb47916 -s ours
Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a
Charles He [Wed, 12 Apr 2017 18:25:46 +0000 (18:25 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
Jiaquan He [Fri, 7 Apr 2017 16:25:10 +0000 (09:25 -0700)]
Fix broken CTS tests.
The default focus highlight should be necessary when the view is
attached to window.
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.ViewTest
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsWidgetTestCases -t
android.widget.cts.MediaControllerTest
Bug:
37082416
Change-Id: I5d6b0c00b5ba03c8f62e4f71be9336823a73134b
Jiaquan He [Mon, 6 Feb 2017 23:59:26 +0000 (15:59 -0800)]
Draw a default focus highlight if needed.
This commit draws a default highlight for a focused
View if it's detected to have no state_focused defined
and its useDefaultFocusHighlight attribute is true.
When we detect a default highlight is needed, we show it
on top of the view to. Once we detect that it's no longer
needed, we remove it.
Test: Check that views without a focused_state in its
state spec have a default highlight when they get focused.
Bug:
35096940
Change-Id: Ifbe4bb9e1297d98845314e24d8b758f14e5987a9
Jiaquan He [Thu, 2 Feb 2017 19:54:12 +0000 (11:54 -0800)]
Add a public API defaultFocusHighlightEnabled.
This commit adds a public API to turn on/off default
focus highlights. When a focused View is detected to
have no state_focused defined, we can use this API to
decide wether we should show a default highlight for it.
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases
-t android.view.cts.View_DefaultFocusHighlightTest
Bug:
35096940
Change-Id: I76b45d6bf5761641a0ed7f4d0b04cb325ed72b52
Siyamed Sinir [Wed, 12 Apr 2017 18:17:57 +0000 (18:17 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
am:
37bfd57ead
Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
TreeHugger Robot [Wed, 12 Apr 2017 18:17:48 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
nharold [Wed, 12 Apr 2017 18:13:55 +0000 (18:13 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Siyamed Sinir [Wed, 12 Apr 2017 18:09:50 +0000 (18:09 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
Makoto Onuki [Wed, 12 Apr 2017 17:10:22 +0000 (10:10 -0700)]
"bmgr restore" really should wait until operation finishes.
Test: manual test
Bug
37246838
Change-Id: Ice381dc250e2d2a59cff48152dd3c8d6897d0804
Dianne Hackborn [Wed, 12 Apr 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
am:
0a0a63c8b1
Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
Powei Feng [Wed, 12 Apr 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
am:
f63cb49b15
Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3
Jakub Pawlowski [Wed, 12 Apr 2017 15:51:22 +0000 (08:51 -0700)]
Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.
This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.
Bug:
30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
Dianne Hackborn [Wed, 12 Apr 2017 17:55:49 +0000 (17:55 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 17:54:03 +0000 (10:54 -0700)]
Add API to get a uid's current importance.
This is kind-of useful to go along with monitoring
uid importance changes.
Test: none yet
Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
TreeHugger Robot [Wed, 12 Apr 2017 17:52:56 +0000 (17:52 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
Derek Sollenberger [Wed, 12 Apr 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
am:
7944962b7e
Change-Id: Iced04463ac3e7f0ff696f2cf75dc064cf704863f
Seigo Nonaka [Wed, 12 Apr 2017 17:37:54 +0000 (17:37 +0000)]
Merge "Remove unused public APIs." into oc-dev
am:
feaa8b0f01
Change-Id: I7ffbb8a98d342f12304bb85ce45498790363703c
OSDN Git Service
