OSDN Git Service
Android Build Merger (Role) [Fri, 21 Jul 2017 20:40:44 +0000 (20:40 +0000)]
Merge "Merge "Update icons in the volume rocker" into oc-dr1-dev am:
cdcbbeccb7 am:
691c2f6ddc" into oc-mr1-dev-plus-aosp
Evan Laird [Fri, 21 Jul 2017 20:39:34 +0000 (20:39 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev am:
cdcbbeccb7
am:
691c2f6ddc
Change-Id: I151d2fdb1c6dd5c79e5a998f7cd27280fcf3aa67
Evan Laird [Fri, 21 Jul 2017 20:39:27 +0000 (20:39 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev am:
cdcbbeccb7
am:
5c3bd91fac
Change-Id: Ica2cf4654552e88f1a39132ba11f548644723f49
Evan Laird [Fri, 21 Jul 2017 20:33:04 +0000 (20:33 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
am:
cdcbbeccb7
Change-Id: Ibd7685290847f651406d5961faa9a9182b859af5
Evan Laird [Fri, 21 Jul 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
am:
cdcbbeccb7
Change-Id: Ia779dc0b9ffdcc599a041d6ffed9f9273f8307f3
TreeHugger Robot [Fri, 21 Jul 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
Julia Reynolds [Fri, 21 Jul 2017 20:08:06 +0000 (20:08 +0000)]
Merge "Fix notification ordering for groups" into oc-mr1-dev
am:
03eb6c9934
Change-Id: I83921013d25ab54b2d67258bd15c99d879d26185
Julia Reynolds [Fri, 21 Jul 2017 20:05:50 +0000 (20:05 +0000)]
Merge "Fix xml loading for managed services" into oc-mr1-dev
am:
04964fe069
Change-Id: Ia5b74cbbbe5ccfe4fbd389c7c4639368aa888648
Steven Moreland [Fri, 21 Jul 2017 19:58:24 +0000 (19:58 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142 am:
16255fda63 am:
4e743f680e
am:
d4d462857b
Change-Id: I1979f57a392d235666d6298c875155878813a2f2
Julia Reynolds [Fri, 21 Jul 2017 19:55:07 +0000 (19:55 +0000)]
Merge "Fix notification ordering for groups" into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 19:52:50 +0000 (19:52 +0000)]
Merge "Fix xml loading for managed services" into oc-mr1-dev
Steven Moreland [Fri, 21 Jul 2017 19:52:04 +0000 (19:52 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142 am:
16255fda63
am:
4e743f680e
Change-Id: Iff1739cb98d1f978f6246bbd73a8163822e2e6c7
Steven Moreland [Fri, 21 Jul 2017 19:43:34 +0000 (19:43 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142
am:
16255fda63
Change-Id: I6e295f30bef2de7fe1840da821db7ea4d8ef72ec
Steven Moreland [Fri, 21 Jul 2017 19:28:14 +0000 (19:28 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
am:
79994cb142
Change-Id: I325335a278fc9aebf7957e23089c72665169eeb3
Christine Franks [Fri, 21 Jul 2017 19:16:05 +0000 (19:16 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am:
484115b77d -s ours
am:
edc3af3f91 -s ours
Change-Id: I5527611a091e5e2c97d3e44339b696015bd1f13b
Steven Moreland [Fri, 21 Jul 2017 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
Steven Moreland [Fri, 21 Jul 2017 19:13:05 +0000 (19:13 +0000)]
Revert "Update for less arguments in hidl toBinder."
This reverts commit
de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.
Change-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656
Android Build Merger (Role) [Fri, 21 Jul 2017 19:10:56 +0000 (19:10 +0000)]
Merge "Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev am:
cfc55bb0a6" into oc-mr1-dev-plus-aosp
Rajeev Kumar [Fri, 21 Jul 2017 19:09:38 +0000 (19:09 +0000)]
Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev
am:
cfc55bb0a6
Change-Id: I6599297a1cb47cc861a04dde4443c261bfb238f1
Christine Franks [Fri, 21 Jul 2017 19:07:32 +0000 (19:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am:
484115b77d
am:
379c317ab8 -s ours
Change-Id: I2a078e098bf879b34fbcb54d82b25b6cd19c65a9
Rajeev Kumar [Fri, 21 Jul 2017 19:02:43 +0000 (19:02 +0000)]
Merge "Data plan setting in SystemUI quick settings." into oc-mr1-dev
am:
56eec29494
Change-Id: I4cf9310cbfb8a6aec263d351dcbba83771b68455
Christine Franks [Fri, 21 Jul 2017 19:00:32 +0000 (19:00 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
am:
484115b77d -s ours
Change-Id: Idd21ecfee03c4fa3a22492528746e222818da86e
Christine Franks [Fri, 21 Jul 2017 19:00:31 +0000 (19:00 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
am:
484115b77d
Change-Id: Id9f50aeab430db43e9f18bcdfd80b6dcac2c43a7
Christine Franks [Fri, 21 Jul 2017 19:00:22 +0000 (19:00 +0000)]
Merge "Remove RetailDemoModeService" into oc-mr1-dev
am:
59d0441b0c
Change-Id: Ibfc275431add77f94e21c3543f1f97d8690c1414
Rajeev Kumar [Fri, 21 Jul 2017 18:55:19 +0000 (18:55 +0000)]
Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 18:53:57 +0000 (18:53 +0000)]
Merge "Data plan setting in SystemUI quick settings." into oc-mr1-dev
Christine Franks [Fri, 21 Jul 2017 18:53:19 +0000 (18:53 +0000)]
Merge "Remove RetailDemoModeService" into oc-mr1-dev
Christine Franks [Fri, 21 Jul 2017 18:53:16 +0000 (18:53 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 18:46:39 +0000 (18:46 +0000)]
Merge "Merge "Add modified API to send more information to VrCore" into oc-dr1-dev am:
c48e304bbf am:
95a3528866" into oc-mr1-dev-plus-aosp
Albert Chaulk [Fri, 21 Jul 2017 18:44:13 +0000 (18:44 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev am:
c48e304bbf
am:
95a3528866
Change-Id: If95f82a5f0dd810c6942b636948066d866dbdc65
Albert Chaulk [Fri, 21 Jul 2017 18:43:08 +0000 (18:43 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev am:
c48e304bbf
am:
8cba74a660
Change-Id: If498e7946dc9ede3c81a62247149ad48723bbbc6
Christopher Tate [Fri, 21 Jul 2017 18:40:35 +0000 (18:40 +0000)]
Merge "Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am:
672f578fd1" into oc-dr1-dev-plus-aosp
am:
11a134083a
Change-Id: I43fd7479768d9b36e8f7c7719386b97336049983
Android Build Merger (Role) [Fri, 21 Jul 2017 18:37:24 +0000 (18:37 +0000)]
Merge "Merge "Update for less arguments in hidl toBinder." am:
602b7be04e am:
b167ed08cc am:
5f04958a73 am:
88901bd0df" into oc-mr1-dev-plus-aosp
Steven Moreland [Fri, 21 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e am:
b167ed08cc am:
5f04958a73
am:
88901bd0df
Change-Id: I198f9500b4dd74cc0d65df8d5112bf61017def4e
Christopher Tate [Fri, 21 Jul 2017 18:34:00 +0000 (18:34 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am:
672f578fd1
am:
3a419bee91
Change-Id: I86eb9913bbf4acb9e90db31cf1650c0369168ff2
Albert Chaulk [Fri, 21 Jul 2017 18:33:53 +0000 (18:33 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am:
c48e304bbf
Change-Id: I1c93664e2300cb9e234cfbc1c453da30a60e61af
Albert Chaulk [Fri, 21 Jul 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am:
c48e304bbf
Change-Id: I7258810e7e1d4a7ad8dcf60efcf8ea6226137167
Android Build Merger (Role) [Fri, 21 Jul 2017 18:29:42 +0000 (18:29 +0000)]
Merge "Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am:
672f578fd1" into oc-dr1-dev-plus-aosp
Christopher Tate [Fri, 21 Jul 2017 18:28:22 +0000 (18:28 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
am:
672f578fd1
Change-Id: Ief696630315b5c1910c8a0721417260b1caab2d0
Christopher Tate [Fri, 21 Jul 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
am:
672f578fd1
Change-Id: I110ab6b96ac3fd866ace40fbe47614e2ad73a787
Steven Moreland [Fri, 21 Jul 2017 18:26:22 +0000 (18:26 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e am:
b167ed08cc
am:
5f04958a73
Change-Id: I051734bc2fe8fd08b36756d66e3a52025fd465bc
Albert Chaulk [Fri, 21 Jul 2017 18:22:38 +0000 (18:22 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
Love Khanna [Fri, 21 Jul 2017 18:22:19 +0000 (18:22 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours am:
b9d0a22aaf am:
cee0ac5fca -s ours
am:
e06c96034c -s ours
Change-Id: I2f016500b673ada62f915b5117b91f8efe358401
Steven Moreland [Fri, 21 Jul 2017 18:19:40 +0000 (18:19 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e
am:
b167ed08cc
Change-Id: I9beb7a7ee639f614260e5ba69496c0e7d9836742
TreeHugger Robot [Fri, 21 Jul 2017 18:18:07 +0000 (18:18 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
Love Khanna [Fri, 21 Jul 2017 18:15:53 +0000 (18:15 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours am:
b9d0a22aaf
am:
cee0ac5fca -s ours
Change-Id: I711d3a31445d3fc694b0289fa9323d5220abd713
Steven Moreland [Fri, 21 Jul 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Update for less arguments in hidl toBinder."
am:
602b7be04e
Change-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546
Calin Juravle [Fri, 21 Jul 2017 18:12:52 +0000 (18:12 +0000)]
Merge "Unhide DelegateLastClassLoader." into oc-mr1-dev
am:
b7a1be6051
Change-Id: I496b6f7d444f4f3efaea44da9938f615914c4ef4
Love Khanna [Fri, 21 Jul 2017 18:05:55 +0000 (18:05 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours
am:
b9d0a22aaf
Change-Id: I4350ef8f09371b73ad1155ed2297627e66acc9d8
Calin Juravle [Fri, 21 Jul 2017 17:58:49 +0000 (17:58 +0000)]
Merge "Unhide DelegateLastClassLoader." into oc-mr1-dev
Love Khanna [Fri, 21 Jul 2017 17:56:59 +0000 (17:56 +0000)]
Merge "NFC DTA Integration"
am:
a42c8a1667 -s ours
Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7
Lucas Dupin [Fri, 21 Jul 2017 17:56:13 +0000 (17:56 +0000)]
Merge "Unhide invalidateColors API" into oc-mr1-dev
am:
a8d14a6ea0
Change-Id: I6eef632d7ca4f8085a5a357038fa63d8a5d49d35
TreeHugger Robot [Fri, 21 Jul 2017 17:51:27 +0000 (17:51 +0000)]
Merge "Unhide invalidateColors API" into oc-mr1-dev
Treehugger Robot [Fri, 21 Jul 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Update for less arguments in hidl toBinder."
Treehugger Robot [Fri, 21 Jul 2017 17:38:53 +0000 (17:38 +0000)]
Merge "NFC DTA Integration"
Jeff Sharkey [Fri, 21 Jul 2017 17:22:26 +0000 (17:22 +0000)]
Merge "Expose SubscriptionPlan API." into oc-mr1-dev
am:
84c6684bba
Change-Id: I9e05d8ae075c698bc4c19132df92ea8f3f3fc52b
Jeff Sharkey [Fri, 21 Jul 2017 17:14:30 +0000 (17:14 +0000)]
Merge "Expose SubscriptionPlan API." into oc-mr1-dev
Julia Reynolds [Tue, 11 Jul 2017 14:39:58 +0000 (10:39 -0400)]
Fix xml loading for managed services
Noticed while adding a shell cmd to toggle notification assistants,
which is also included
Bug:
62263757
Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
(cherry picked from commit
88facd4d9ac18630e4cc44db22b88b4ba26e775a)
Android Build Merger (Role) [Fri, 21 Jul 2017 16:50:31 +0000 (16:50 +0000)]
Merge "Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev am:
53ddffdf3a am:
94e56bc598" into oc-mr1-dev-plus-aosp
Lucas Dupin [Fri, 21 Jul 2017 16:49:14 +0000 (16:49 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev am:
53ddffdf3a
am:
573e6ec9a3
Change-Id: If6d3b1cad8b7ba37dd9a12d57566dcd4393648ac
Lucas Dupin [Fri, 21 Jul 2017 16:49:13 +0000 (16:49 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev am:
53ddffdf3a
am:
94e56bc598
Change-Id: I9afa6eee62b0077c19da554ee1d04cb622c4bb20
Lucas Dupin [Fri, 21 Jul 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
am:
53ddffdf3a
Change-Id: Ibb7783661bdb4e37d6542071c158e7a486493b95
Lucas Dupin [Fri, 21 Jul 2017 16:44:28 +0000 (16:44 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
am:
53ddffdf3a
Change-Id: I42729d1a98ec4272671fa8ae8da7ccb6798a82fa
Neil Fuller [Fri, 21 Jul 2017 16:38:49 +0000 (16:38 +0000)]
Merge "Logging improvements for time zone updates" into oc-mr1-dev
am:
3e14c1ab49
Change-Id: I0ac2aeb5d9bbdadc415db5f460b4d3e7ab636699
Lucas Dupin [Fri, 21 Jul 2017 16:34:33 +0000 (16:34 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 16:33:13 +0000 (16:33 +0000)]
Merge "Logging improvements for time zone updates" into oc-mr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 16:23:32 +0000 (16:23 +0000)]
Merge "Merge "Fix snapshots for dialogs" into oc-dr1-dev am:
089d45de8f am:
1b891e098f" into oc-mr1-dev-plus-aosp
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Jorim Jaggi [Fri, 21 Jul 2017 16:22:11 +0000 (16:22 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev am:
089d45de8f
am:
d8aa259df1
Change-Id: I33d6cbdb193b1068aa5905f3d33464df9f342e0c
Jorim Jaggi [Fri, 21 Jul 2017 16:22:09 +0000 (16:22 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev am:
089d45de8f
am:
1b891e098f
Change-Id: Iaaa5d5dca2ee9ab2473ca26f425d407007f5d043
Jorim Jaggi [Fri, 21 Jul 2017 16:17:46 +0000 (16:17 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
am:
089d45de8f
Change-Id: Ica95fc3e55e3291dd43bd5173899cf30a328021e
Jorim Jaggi [Fri, 21 Jul 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
am:
089d45de8f
Change-Id: I6429fcdc5c012f653143cb8b8161b8f1626293f9
Jorim Jaggi [Fri, 21 Jul 2017 16:10:52 +0000 (16:10 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
DO NOT MERGE - Remove RetailDemoModeService
Bug:
62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
Android Build Merger (Role) [Fri, 21 Jul 2017 15:50:14 +0000 (15:50 +0000)]
Merge "Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev am:
5898d52184 am:
a85d37a61e" into oc-mr1-dev-plus-aosp
Michael Wright [Fri, 21 Jul 2017 15:47:30 +0000 (15:47 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev am:
5898d52184
am:
a85d37a61e
Change-Id: I31f8ebe84298ba7005fdf8ed68f20ebd8bba7d28
Michael Wright [Fri, 21 Jul 2017 15:47:22 +0000 (15:47 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev am:
5898d52184
am:
e92c48e6ca
Change-Id: Ib5167be02d5f8e748664fc1c0441e39fbf0a0c46
Steven Moreland [Thu, 20 Jul 2017 16:24:56 +0000 (09:24 -0700)]
Update for less arguments in hidl toBinder.
Removed unnecessary templatization argument.
Test: hidl_test_java
Bug:
32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3
Michael Wright [Fri, 21 Jul 2017 15:38:47 +0000 (15:38 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am:
5898d52184
Change-Id: I5bc6a34975e5b044122998a05ab573a9ed431ecd
Michael Wright [Fri, 21 Jul 2017 15:38:39 +0000 (15:38 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am:
5898d52184
Change-Id: Iec3589b58bf218f9bae61de60cb0a90ff2932277
TreeHugger Robot [Fri, 21 Jul 2017 15:30:42 +0000 (15:30 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
Narayan Kamath [Thu, 20 Jul 2017 13:09:19 +0000 (14:09 +0100)]
Unhide DelegateLastClassLoader.
Tracks libcore change
0209ec7e3c608acc3f1b63413686a3391551dcd5.
Test: make update-api; make checkapi
Bug:
37966546
Change-Id: Idfc22eff5d8bb82690f99a73765dc58dc6fd99fe
(cherry picked from commit
be0fc6e48ee0ef44472edcca09b472fb0c497eed)
Android Build Merger (Role) [Fri, 21 Jul 2017 15:12:58 +0000 (15:12 +0000)]
Merge changes from topic 'am-
5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3 am:
f0613cdab7
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e am:
4c535d5580
Michael Wright [Fri, 21 Jul 2017 15:10:49 +0000 (15:10 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3
am:
d9cc31d158
Change-Id: I7365dbd9e69c86f84ad88c78ad0f24c2c8f16986
Michael Wright [Fri, 21 Jul 2017 15:10:37 +0000 (15:10 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3
am:
f0613cdab7
Change-Id: I74acd77221995f6c92c004fdec6e97e059a4591f
Adrian Roos [Fri, 21 Jul 2017 15:09:50 +0000 (15:09 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e
am:
67c19ff3a6
Change-Id: Idf75f2b3c9c3468e1970ba59eb117cc60c784599
Adrian Roos [Fri, 21 Jul 2017 15:09:40 +0000 (15:09 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e
am:
4c535d5580
Change-Id: I2c7bf05d801323121ea2f57c5ed191553b5e05bb
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
Remove RetailDemoModeService
Bug:
62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: Ie643ec6a1c917aa2d9364dbc431121f19a8a7e31
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: I37bedda77be7b9d832da8dd4e9efeab714ac8d66
Adrian Roos [Fri, 21 Jul 2017 14:59:12 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261
Adrian Roos [Fri, 21 Jul 2017 14:59:11 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I70c0f6e119344358ef460c994adc6189d396400b
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
Geoffrey Pitsch [Fri, 21 Jul 2017 14:11:40 +0000 (14:11 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
am:
2d3356375a
Change-Id: I76dc18d9216213b1308c9f54dcf9adcb355c3300
TreeHugger Robot [Fri, 21 Jul 2017 14:02:59 +0000 (14:02 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
Neil Fuller [Thu, 20 Jul 2017 10:00:35 +0000 (11:00 +0100)]
Logging improvements for time zone updates
Logging improvements for time zone updates:
1) Add EventLog entries time zone update service interactions.
2) Add more information to dumpsys logs to improve debugging.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above for unit testing.
Test: Internal xTS tests
Test: adb shell dumpsys timezone
Test: adb logcat -b events -v threadtime -v printable -v uid -d *:v
Change-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29
(cherry picked from commit
d857f676744af55c79c4871c881bf9598f6b21e9)
Jorim Jaggi [Thu, 20 Jul 2017 16:09:20 +0000 (18:09 +0200)]
Fix snapshots for dialogs
When taking a snapshot, always include the full stack bounds.
When showing a snapshot starting window, use the SystemUI flags
from the top fullscreen window in the task - this is the same way
as we do it when the real windows are going to be visible.
Test: Revoke contacts permissions, launch contacts, go to recents,
go back.
Test: go/wm-smoke
Fixes:
63268663
Change-Id: If8d9701f6d34abd56116ed04fe27fe82688e506a
Suprabh Shukla [Fri, 21 Jul 2017 09:43:05 +0000 (09:43 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
e7e68b8991
Change-Id: Ib74abddd20d84e1841564598161fe916f9b14ca3
Suprabh Shukla [Fri, 21 Jul 2017 09:39:57 +0000 (09:39 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
ab0e78c4b4
Change-Id: Iaf833dd548543d7b0f8e6353080692fbb3ab7cd2
OSDN Git Service
