OSDN Git Service
Fan Zhang [Fri, 21 Jul 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d
am:
82388cda78 -s ours
Change-Id: Id77630e986146853377916f1551ea48d7ad904bf
Andrii Kulian [Fri, 21 Jul 2017 23:23:32 +0000 (23:23 +0000)]
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
am:
504ea09356
Change-Id: Ifd1f209c7e71ea731363af01dcc0894b5553612b
Andrii Kulian [Fri, 21 Jul 2017 23:22:18 +0000 (23:22 +0000)]
DO NOT MERGE ActivityView be gone!
am:
94e82d9b0e
Change-Id: I54725b8840f0e839fbb4df5514b03f73a9d80245
Andrii Kulian [Fri, 21 Jul 2017 23:16:24 +0000 (23:16 +0000)]
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
* changes:
DO NOT MERGE VirtualDisplay wrapper with input forwarding
DO NOT MERGE ActivityView be gone!
Fan Zhang [Fri, 21 Jul 2017 23:06:20 +0000 (23:06 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d
Change-Id: I351f0df469be67b5998567d7fb9ff0163d613a1d
TreeHugger Robot [Fri, 21 Jul 2017 22:59:13 +0000 (22:59 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
Bill Yi [Fri, 21 Jul 2017 21:58:39 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1cdf8ff72e -s ours
Change-Id: Ief3a2219a09165b4dfa0c79f5e10098843eadc30
Bill Yi [Fri, 21 Jul 2017 21:57:03 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
6acefed3dc -s ours
Change-Id: I5265b85a29a58030443b2881cb62ece9d5514077
TreeHugger Robot [Fri, 21 Jul 2017 21:53:26 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 21:51:23 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hall Liu [Fri, 21 Jul 2017 21:35:15 +0000 (21:35 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8 am:
14be4e65b2 am:
0f18557df8
am:
a3011a0401
Change-Id: Ie13260ff426a0a160c44a1a7f05a2f3b2e86548a
Hall Liu [Fri, 21 Jul 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8 am:
14be4e65b2
am:
0f18557df8
Change-Id: I84aa982760377be0df6f8fbca6d5a32d1036f16a
Hall Liu [Fri, 21 Jul 2017 21:23:36 +0000 (21:23 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8
am:
14be4e65b2
Change-Id: Ida2487f5be62ea6f4de0668abb830590494c880a
Hall Liu [Fri, 21 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Merge "Make slight API and doc adjustments"
am:
b7e10650d8
Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
Hall Liu [Fri, 21 Jul 2017 21:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
Dake Gu [Fri, 21 Jul 2017 21:01:07 +0000 (21:01 +0000)]
Merge "Initial commit of leanback uibench test" into oc-mr1-dev
am:
70bc905201
Change-Id: Ib57348d8d5983383598aa5f0adcf1845038b76be
Dake Gu [Fri, 21 Jul 2017 20:55:26 +0000 (20:55 +0000)]
Merge "Initial commit of leanback uibench test" into oc-mr1-dev
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
Andrii Kulian [Mon, 26 Jun 2017 21:57:02 +0000 (14:57 -0700)]
DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.
Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.
Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
app, then it must be embeddable and launcher must have
permission to embed.
Bug:
63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
Andrii Kulian [Thu, 13 Jul 2017 22:33:06 +0000 (15:33 -0700)]
DO NOT MERGE ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.
Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
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
Fan Zhang [Fri, 21 Jul 2017 17:21:36 +0000 (10:21 -0700)]
Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.
Merged-In: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Change-Id: Ied4a0359f9bc22ee94ec79c0591d2671a9c31b86
Fix:
63908636
Test: robotests
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
Bill Yi [Fri, 21 Jul 2017 19:05:22 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9905307a26573e5e19db63f85ba4a89bab47b166
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
Bill Yi [Fri, 21 Jul 2017 18:34:26 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbabbb028c08625372cf1ee1606e3cba1d36a27a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
OSDN Git Service
