OSDN Git Service
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:57:09 +0000 (03:57 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am:
0964a2d9fc
am:
2679fe4e95
Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:47:25 +0000 (03:47 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
am:
0964a2d9fc
Change-Id: I800980c3c887dd722410b427b7912b254012effc
TreeHugger Robot [Thu, 13 Apr 2017 03:36:23 +0000 (03:36 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
Jocelyn Dang [Thu, 13 Apr 2017 03:08:46 +0000 (03:08 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev am:
78b3b2308c
am:
ae624f3f0b
Change-Id: Ibae7b4256adfdf9265d68dffbb5189326342471e
Jocelyn Dang [Thu, 13 Apr 2017 02:58:37 +0000 (02:58 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
am:
78b3b2308c
Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
Jocelyn Dang [Thu, 13 Apr 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 02:30:10 +0000 (02:30 +0000)]
Merge "Address API review for ProxyFileDescriptorCallback"
Sudheer Shanka [Thu, 13 Apr 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev am:
67e802dd5e
am:
012ddf15c7
Change-Id: Ic491c87920519ac0fc04353f62f02a45dc1ba5fc
Sudheer Shanka [Thu, 13 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
am:
67e802dd5e
Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
Sudheer Shanka [Thu, 13 Apr 2017 01:53:28 +0000 (01:53 +0000)]
Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev
Winson Chung [Thu, 13 Apr 2017 01:48:53 +0000 (01:48 +0000)]
Merge "Fix regression when removing task." into oc-dev am:
efbcb0d2cc
am:
67004e209d
Change-Id: I523d86f963a6346edac079abde552e5dff732fb6
Dianne Hackborn [Thu, 13 Apr 2017 01:47:43 +0000 (01:47 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev am:
c62f0d7495
am:
bea817a712
Change-Id: I58010d9417177fed45d01a5c9498aa38cc3c2566
Winson Chung [Thu, 13 Apr 2017 01:39:01 +0000 (01:39 +0000)]
Merge "Fix regression when removing task." into oc-dev
am:
efbcb0d2cc
Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
Dianne Hackborn [Thu, 13 Apr 2017 01:38:01 +0000 (01:38 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
am:
c62f0d7495
Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
TreeHugger Robot [Thu, 13 Apr 2017 01:29:27 +0000 (01:29 +0000)]
Merge "Fix regression when removing task." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 01:27:50 +0000 (01:27 +0000)]
Merge "Work on issue #
36427964: SecurityException: Unable to find app..." into oc-dev
Salvador Martinez [Thu, 13 Apr 2017 01:11:25 +0000 (01:11 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev am:
dc52fd3168
am:
37393f92f3
Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866
Salvador Martinez [Thu, 13 Apr 2017 01:01:35 +0000 (01:01 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev
am:
dc52fd3168
Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
Wale Ogunwale [Thu, 13 Apr 2017 00:58:29 +0000 (00:58 +0000)]
Merge "Dump controller for AppWindowToken" into oc-dev am:
b74567dd3b
am:
651a2970e6
Change-Id: I1b116104494c3c3797c9a6d6277e6ae668f5d232
Wale Ogunwale [Thu, 13 Apr 2017 00:57:31 +0000 (00:57 +0000)]
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev am:
343cf6e920
am:
c1cb7039b1
Change-Id: I7367e0f6b347c957ce6a6439c31ab657876930c2
TreeHugger Robot [Thu, 13 Apr 2017 00:51:22 +0000 (00:51 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Dump controller for AppWindowToken" into oc-dev
am:
b74567dd3b
Change-Id: I1c166eb1c7ad36396d7a463549d0ab1f9daebb61
Wale Ogunwale [Thu, 13 Apr 2017 00:48:06 +0000 (00:48 +0000)]
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
am:
343cf6e920
Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d
TreeHugger Robot [Thu, 13 Apr 2017 00:43:38 +0000 (00:43 +0000)]
Merge "Dump controller for AppWindowToken" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:39:12 +0000 (00:39 +0000)]
Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev
Wale Ogunwale [Thu, 13 Apr 2017 00:36:34 +0000 (00:36 +0000)]
Revert "Ensure visible activities when device is unlocked."
Causes issues with window life-cycle...
Bug:
37119770
Bug:
37244415
Bug:
37281544
This reverts commit
7004a8801d0a60013681a86043bab74b4d42d680.
Change-Id: I0039db6e44488cd82ef745aa979bc8549fd8aeed
TreeHugger Robot [Thu, 13 Apr 2017 00:31:59 +0000 (00:31 +0000)]
Merge "Remove support for auto-paging of cursors."
Chad Brubaker [Thu, 13 Apr 2017 00:22:49 +0000 (00:22 +0000)]
Merge "Expose more settings to Instant Apps" into oc-dev am:
055b51af28
am:
a927a8c3ba
Change-Id: I3224b23298ad06cd6a75ae1a5d96f0690c7bccf3
Evan Rosky [Thu, 13 Apr 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Fix focus ordering with duplicate ids" into oc-dev am:
a0ce440d60
am:
33f6bcb71d
Change-Id: I06f4cc41131ca82c6bfb75fcd174741589d936a4
Chad Brubaker [Thu, 13 Apr 2017 00:11:16 +0000 (00:11 +0000)]
Merge "Expose more settings to Instant Apps" into oc-dev
am:
055b51af28
Change-Id: I1bddeffc290009c2ebf34168dc9ba8b69fe81e98
Evan Rosky [Thu, 13 Apr 2017 00:06:42 +0000 (00:06 +0000)]
Merge "Fix focus ordering with duplicate ids" into oc-dev
am:
a0ce440d60
Change-Id: I05050c7d2078a21f86a096ebc65bc2d6d8b4aa6a
Chad Brubaker [Wed, 12 Apr 2017 23:51:37 +0000 (23:51 +0000)]
Merge "Expose more settings to Instant Apps" into oc-dev
Evan Rosky [Wed, 12 Apr 2017 23:49:57 +0000 (23:49 +0000)]
Merge "Fix focus ordering with duplicate ids" into oc-dev
Roozbeh Pournader [Wed, 12 Apr 2017 23:49:15 +0000 (23:49 +0000)]
Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev am:
d39388219f
am:
4d56a0019a
Change-Id: Idbb6b973a9aa67c9454ed0f839de56fae109561b
Rob Carr [Wed, 12 Apr 2017 23:47:53 +0000 (23:47 +0000)]
Merge "Fix auto-pip visibility issues." into oc-dev am:
7040f573f3
am:
4c613520c3
Change-Id: Ifd2762e1d196b5f353d90a9612c1fcb55cc82976
Lorenzo Colitti [Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)]
Merge "Merge changes from topic 'network_specifier' am:
d0f476bdae am:
362bef45d1 am:
cfd729093f" into oc-dev-plus-aosp
am:
a7e30062c9
Change-Id: I6500639ae839ee9ad5af34d1292d1539c943e2ad
Jiaquan He [Wed, 12 Apr 2017 23:39:41 +0000 (23:39 +0000)]
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev am:
18d993bb72
am:
7ed2b1adeb
Change-Id: Ie92d455fdc43e627ef436191f8d72737b68c4d96
Jiaquan He [Wed, 12 Apr 2017 23:38:12 +0000 (23:38 +0000)]
Draw a default focus highlight if needed. am:
8062949ece
am:
d415eac183 -s ours
Change-Id: I847beeafcdf68ce8228574e754bfd722ec89e0b8
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
Jiaquan He [Wed, 12 Apr 2017 23:36:40 +0000 (23:36 +0000)]
Add a public API defaultFocusHighlightEnabled. am:
b7daaf8b5f
am:
557922d37a
Change-Id: I84f82f570dbd32769c82be426bbbc184cc1f53ac
Jiaquan He [Wed, 12 Apr 2017 23:35:40 +0000 (23:35 +0000)]
Detect unhandled keyboard focused state. am:
4a81674b45
am:
4bd8bce6d7
Change-Id: I506ff2c909aa98f049d2f663a6cf714e3e06e6d6
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
Tony Mak [Wed, 12 Apr 2017 22:51:35 +0000 (22:51 +0000)]
Merge "clear calling identity before calling settings provider" into oc-dev am:
c240c9b134
am:
a06e779bfe
Change-Id: Ie2baee0eb27b8c593227dc99e1191a5a44b4c500
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.
Jocelyn Dang [Fri, 31 Mar 2017 21:03:37 +0000 (14:03 -0700)]
Add set-mode command to turn battery saver mode on and off.
Affected test will be modified in ag/
2101279
Test: adb shell cmd battery unplug && adb shell cmd power set-mode 0
Bug:
31944272
Change-Id: Ia88e7e164aa9b8b4d0ab51f607a64b35e2159273
Amit Mahajan [Wed, 12 Apr 2017 22:30:39 +0000 (22:30 +0000)]
Merge "Add p2 option in openLogicalChannel." into oc-dev am:
682ce66309
am:
1c29bdda34
Change-Id: I31176c61432ed9efb999991745fc635b734e66ee
Jakub Pawlowski [Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97 am:
d43127865b am:
ce8de6c3f7
am:
2ef7bb7b06
Change-Id: Id53332e5bfbd22690992b0d010a24d3601c03092
Dianne Hackborn [Wed, 12 Apr 2017 22:28:10 +0000 (22:28 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev am:
81bfe1f62e
am:
59c6507670
Change-Id: Iae5d6a6e9fd9d55fbd8a1403aed85e434245dcc6
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.
Svet Ganov [Wed, 12 Apr 2017 22:27:09 +0000 (22:27 +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
am:
ed0454fa80
Change-Id: Ieaf8c4e1619c18f226ab220d6029770d22275e56
Julius D'souza [Wed, 12 Apr 2017 22:26:03 +0000 (22:26 +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
am:
be09e43773
Change-Id: Ib322b18afd1f084152c2c95fc78b2aac3005f4f8
Svet Ganov [Wed, 12 Apr 2017 22:24:54 +0000 (22:24 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16 am:
91ed4d7553 -s ours am:
84ec9cbace
am:
e9e44c7892
Change-Id: Ic41bfe5a321faf090d9694acc299cccb706947db
Julius D'souza [Wed, 12 Apr 2017 22:23:48 +0000 (22:23 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886 am:
f72dd4142b -s ours am:
3a967f92f2
am:
b19d94bf80
Change-Id: I7a6c5c8e108140564f0f4ff104501e9eb54cd83f
Svet Ganov [Wed, 12 Apr 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Add autofill feature API" into oc-dev am:
a402d6dd2f
am:
bbef731c2d
Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de
Dianne Hackborn [Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)]
Merge "Add API to get a uid's current importance." into oc-dev am:
ad6ab44e15
am:
ef95ec85ea
Change-Id: I1c9dce1a5e6e049de65a5f68231a195b9e5d4510
Makoto Onuki [Wed, 12 Apr 2017 22:20:25 +0000 (22:20 +0000)]
Merge ""bmgr restore" really should wait until operation finishes." into oc-dev am:
b4c2e6f468
am:
3c0b432ea4
Change-Id: Ib9c45438a8b140028c7e025f4c80ec2d29d9ebc0
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
Dianne Hackborn [Wed, 12 Apr 2017 22:16:05 +0000 (22:16 +0000)]
Merge "Fix issue #
37220301: Allow broadcasts with permissions to not be restricted" into oc-dev am:
f74210c3a3
am:
33e80232fc
Change-Id: I9a34336bac3636bb672bf640e4525ec24cd6f2f8
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
Selim Gurun [Wed, 12 Apr 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Deprecate findAddress() method" into oc-dev am:
c68b1a8aef
am:
24d68dc3d8
Change-Id: I3cacbe34c084eb6f98a141535293d5c783a9243b
Shuo Qian [Wed, 12 Apr 2017 22:11:17 +0000 (22:11 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368 am:
40cde7b71f am:
36611a0958
am:
56d3af6680
Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0
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
nharold [Wed, 12 Apr 2017 21:43:27 +0000 (21:43 +0000)]
Merge changes from topic 'am-
e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
am:
9a5d047750
Change-Id: I986d031a47a578fda9f61b58e401e7ff53e24bc3
Jason Monk [Wed, 12 Apr 2017 21:42:00 +0000 (21:42 +0000)]
Merge "Make QS light" into oc-dev am:
755138bb1c
am:
5881209cac
Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91
Bill Yi [Wed, 12 Apr 2017 21:40:52 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88ab6c1304 -s ours
am:
8c53d24399 -s ours
Change-Id: I13211570b6e817af73bade9bd26828b833892377
Todd Kennedy [Wed, 12 Apr 2017 21:39:55 +0000 (21:39 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev am:
e7b806e9d2
am:
455b742bb6
Change-Id: I12b658529a580c1d29e7dc99f60b87ff048706a3
Dianne Hackborn [Wed, 12 Apr 2017 21:37:47 +0000 (21:37 +0000)]
Merge "Allow appops command to modify uid ops." into oc-dev
Seigo Nonaka [Wed, 12 Apr 2017 21:37:09 +0000 (21:37 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am:
1e924df63e
am:
fa4b862518
Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84
Jakub Pawlowski [Wed, 12 Apr 2017 21:35:25 +0000 (21:35 +0000)]
Merge "Bluetooth 5 PHY simplification"
am:
a9acf9db97
Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
Sudheer Shanka [Wed, 12 Apr 2017 21:29:14 +0000 (14:29 -0700)]
Update NPMS internal state when app idle parole state is changed.
Fixes:
37250313
Test: 1. cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
2. runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I5fcac397116a07fe9015b7dabf5bca57b0b23176
Jesse Evans [Wed, 12 Apr 2017 21:35:09 +0000 (21:35 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am:
684b5381e9
am:
3d1676cfc4
Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4
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
Jaewan Kim [Wed, 12 Apr 2017 21:33:58 +0000 (21:33 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev am:
e7ce1d40e1
am:
e391fe76e8
Change-Id: Ibf0d1a860cf8cece27f84bb2a9f0c5039ecfd03b
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
Julia Reynolds [Wed, 12 Apr 2017 21:32:54 +0000 (21:32 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev am:
43dd3ba3c4
am:
bf3f4dd7f5
Change-Id: Ib0285d815731cf3ef6ed4c06272584284d54209a
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
Casey Burkhardt [Wed, 12 Apr 2017 21:31:48 +0000 (21:31 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev am:
9aa64e6cfa
am:
79bc410133
Change-Id: Ia5d0218553dd2a3d2f0a190f2d091e3180fe5773
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
Svet Ganov [Wed, 12 Apr 2017 21:30:44 +0000 (21:30 +0000)]
Merge "Fill UI polish" into oc-dev am:
c9a83326c2
am:
400f10fe50
Change-Id: Iabc6c0673960d8fee59d78e549ea04826064c37e
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
OSDN Git Service
