OSDN Git Service
Hugo Benichi [Thu, 13 Apr 2017 10:10:27 +0000 (10:10 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929 am:
8e5ebd9261
am:
b98eee1f78
Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
Hugo Benichi [Thu, 13 Apr 2017 09:40:19 +0000 (09:40 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929
am:
8e5ebd9261
Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
Hugo Benichi [Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
am:
c923752929
Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
Treehugger Robot [Thu, 13 Apr 2017 09:24:32 +0000 (09:24 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
* changes:
Captive portal: regroup hardcoded http response codes.
Captive portal: rotate fallback urls
Erik Kline [Thu, 13 Apr 2017 08:44:51 +0000 (08:44 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52 am:
85f5725fb5
am:
270ab2fa7e
Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
Erik Kline [Thu, 13 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52
am:
85f5725fb5
Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
Robert Carr [Thu, 13 Apr 2017 08:34:19 +0000 (08:34 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
am:
22762b2283
Change-Id: I5685e1d7b4747a5e0276158f11de355131fc4dea
Erik Kline [Thu, 13 Apr 2017 08:33:12 +0000 (08:33 +0000)]
Merge "Extract SimChangeListener to its own file"
am:
0ef8df6d52
Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
Narayan Kamath [Thu, 13 Apr 2017 08:28:13 +0000 (08:28 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
am:
6780828985
Change-Id: I966efbe35b0fa0416a5057cb9a1df001baa4590d
TreeHugger Robot [Thu, 13 Apr 2017 08:25:05 +0000 (08:25 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
Treehugger Robot [Thu, 13 Apr 2017 08:19:05 +0000 (08:19 +0000)]
Merge "Extract SimChangeListener to its own file"
Narayan Kamath [Thu, 13 Apr 2017 08:16:45 +0000 (08:16 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:53:39 +0000 (07:53 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
am:
d280bfea23
Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
Hugo Benichi [Mon, 10 Apr 2017 08:08:06 +0000 (17:08 +0900)]
Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.
This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.
Test: built, flashed, tested manually with various portal networks
Bug:
36532213
Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:41:29 +0000 (07:41 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
Robert Carr [Thu, 13 Apr 2017 07:22:01 +0000 (07:22 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
am:
9d5ac93cc3
Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
TreeHugger Robot [Thu, 13 Apr 2017 07:12:51 +0000 (07:12 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
Dan Sandler [Thu, 13 Apr 2017 07:05:05 +0000 (07:05 +0000)]
Merge "Minor text fixes." into oc-dev
am:
818c408e5d
Change-Id: I344ae2f6456893defd49d9efe5af8325770bcf83
TreeHugger Robot [Thu, 13 Apr 2017 07:00:54 +0000 (07:00 +0000)]
Merge "Minor text fixes." into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 06:59:33 +0000 (06:59 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
am:
d1a6e6740f
Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
Michael Wright [Thu, 13 Apr 2017 06:55:21 +0000 (06:55 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
am:
07d60cce02
Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
TreeHugger Robot [Thu, 13 Apr 2017 06:54:18 +0000 (06:54 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 06:54:21 +0000 (06:54 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
am:
4ad2ebcc90
Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
TreeHugger Robot [Thu, 13 Apr 2017 06:48:25 +0000 (06:48 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 06:42:48 +0000 (06:42 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
Chong Zhang [Thu, 13 Apr 2017 06:34:25 +0000 (06:34 +0000)]
Merge changes from topic 'api-review' into oc-dev
am:
fd89a95f35
Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
Chong Zhang [Thu, 13 Apr 2017 06:32:28 +0000 (06:32 +0000)]
MediaCas: address comments for API reviews
am:
addc39ec27
Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
TreeHugger Robot [Thu, 13 Apr 2017 06:23:45 +0000 (06:23 +0000)]
Merge changes from topic 'api-review' into oc-dev
* changes:
MediaCas: combine openSession methods
MediaCas: address comments for API reviews
Erik Kline [Thu, 13 Apr 2017 06:18:38 +0000 (06:18 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c am:
1303b8b9ca
am:
1d3528ba86
Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
Erik Kline [Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c
am:
1303b8b9ca
Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
Erik Kline [Thu, 13 Apr 2017 06:00:37 +0000 (06:00 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
am:
f854c9034c
Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
Treehugger Robot [Thu, 13 Apr 2017 05:49:31 +0000 (05:49 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
Lorenzo Colitti [Thu, 13 Apr 2017 05:48:37 +0000 (05:48 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b am:
67401e25c2
am:
997e6b085a
Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
Lorenzo Colitti [Thu, 13 Apr 2017 05:37:01 +0000 (05:37 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b
am:
67401e25c2
Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
Lorenzo Colitti [Thu, 13 Apr 2017 05:29:58 +0000 (05:29 +0000)]
Merge "Move some NetworkStats tests to tests/net."
am:
ab3901dc8b
Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
Lorenzo Colitti [Thu, 13 Apr 2017 05:18:46 +0000 (05:18 +0000)]
Merge "Move some NetworkStats tests to tests/net."
Daichi Hirono [Thu, 13 Apr 2017 04:42:22 +0000 (04:42 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
am:
96907e6553
Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
Robert Carr [Tue, 11 Apr 2017 01:34:33 +0000 (18:34 -0700)]
Stack APPLICATION_MEDIA_OVERLAY windows with relative layering.
See accompanying frameworks/native commit
"SurfaceFlinger: Add parent-less relative layering" for a full explanation.
Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug:
36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
TreeHugger Robot [Thu, 13 Apr 2017 04:36:45 +0000 (04:36 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
Erik Kline [Fri, 7 Apr 2017 06:29:29 +0000 (15:29 +0900)]
Ignore potential SystemProperties errors when setting net.dns
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
33308258
Bug:
36249702
Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
Fyodor Kupolov [Thu, 13 Apr 2017 04:13:44 +0000 (04:13 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
am:
1423ea3a45
Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
TreeHugger Robot [Thu, 13 Apr 2017 04:08:17 +0000 (04:08 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
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 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
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: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:01:35 +0000 (01:01 +0000)]
Merge "Added strings for thermal shutdown warning" into oc-dev
am:
dc52fd3168
Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
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
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: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.
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
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
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
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