OSDN Git Service
Love Khanna [Sat, 22 Jul 2017 00:29:02 +0000 (00:29 +0000)]
NFC DTA Integration am:
276f9fe619 -s ours am:
2275fe2c53 -s ours
am:
8818423e4e -s ours
Change-Id: I364b07c5d7be8ec6bc58286aac4e82be6210287e
Love Khanna [Sat, 22 Jul 2017 00:18:48 +0000 (00:18 +0000)]
NFC DTA Integration am:
276f9fe619 -s ours
am:
2275fe2c53 -s ours
Change-Id: I15aa809c2fe9374dd569aac3e618acd2dd154414
David Friedman [Sat, 22 Jul 2017 00:16:24 +0000 (00:16 +0000)]
Merge "Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
93a1ab8ba1" into oc-mr1-dev-plus-aosp
am:
1857908a20
Change-Id: I8e92d815dd0c4fd3fd0a7ffa5f7578bba927c154
Fan Zhang [Sat, 22 Jul 2017 00:14:52 +0000 (00:14 +0000)]
Merge "Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours am:
e8fe97e09d" into oc-mr1-dev-plus-aosp
am:
60e031823b -s ours
Change-Id: I7bddc8662c33dcf858f673cc902b2b920baf28fe
Love Khanna [Sat, 22 Jul 2017 00:14:17 +0000 (00:14 +0000)]
NFC DTA Integration
am:
276f9fe619 -s ours
Change-Id: I34e2fa236f5e590f4f21dcc45e1fa8a045c37ade
Steven Moreland [Sat, 22 Jul 2017 00:12:04 +0000 (00:12 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a am:
e3d7919730 am:
7865678ac4
am:
e380004683
Change-Id: I872887b899312dbe4698b923a9d634d303de404c
David Friedman [Sat, 22 Jul 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
cde37c8836 am:
f53a3c84e5
am:
ecf7d7bbcb
Change-Id: Idb72c783fa3c30d48a4429070b6b35bad804e000
Android Build Merger (Role) [Sat, 22 Jul 2017 00:06:08 +0000 (00:06 +0000)]
Merge "Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
93a1ab8ba1" into oc-mr1-dev-plus-aosp
David Friedman [Sat, 22 Jul 2017 00:05:03 +0000 (00:05 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190 am:
ff160ae465
am:
bad118a0b4
Change-Id: I7ef10fb02fc2251123cafde32f83cacef0fce743
David Friedman [Sat, 22 Jul 2017 00:05:01 +0000 (00:05 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190
am:
93a1ab8ba1
Change-Id: I862a759acc9b8475c95c94ad53202812d5b01a72
Android Build Merger (Role) [Sat, 22 Jul 2017 00:04:28 +0000 (00:04 +0000)]
Merge "Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours am:
e8fe97e09d" into oc-mr1-dev-plus-aosp
Fan Zhang [Sat, 22 Jul 2017 00:02:55 +0000 (00:02 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d -s ours
am:
e8fe97e09d
Change-Id: Ie272b010c4fbb9da33f9832c8594846cebfaaf16
Fan Zhang [Sat, 22 Jul 2017 00:02:52 +0000 (00:02 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am:
689359914d am:
82388cda78 -s ours
am:
07b05cf1e3 -s ours
Change-Id: Ifc962d6891311aad026db7fe254d24ab0329e6b5
Steven Moreland [Sat, 22 Jul 2017 00:02:06 +0000 (00:02 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a am:
e3d7919730
am:
7865678ac4
Change-Id: Ia5ee160327adff153f2fb81b73af26528a83e87d
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
David Friedman [Fri, 21 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
cde37c8836
am:
f53a3c84e5
Change-Id: I42870687ca444600d82f8f5cbbee8418fa2ee11b
David Friedman [Fri, 21 Jul 2017 23:57:18 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334 am:
f20c492190
am:
ff160ae465
Change-Id: I38aa24b225827f7a280f5fcd85c08a0424d10b06
David Friedman [Fri, 21 Jul 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
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
Fan Zhang [Fri, 21 Jul 2017 23:55:17 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d -s ours
Change-Id: I0193cc14eecb868b4bc4f47fe10d07aa4e787a5c
Steven Moreland [Fri, 21 Jul 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a
am:
e3d7919730
Change-Id: Idfa23e4e3498b1e65738a79f291008d96974a32e
TreeHugger Robot [Fri, 21 Jul 2017 23:39:08 +0000 (23:39 +0000)]
Merge "Add all battery related tests to BatteryStatsTests suite."
Steven Moreland [Fri, 21 Jul 2017 23:34:17 +0000 (23:34 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148
am:
d37f13603a
Change-Id: Ib0d843954f0a4854b6cea5ef3a4e0ad1ed4f29cb
Andrii Kulian [Fri, 21 Jul 2017 23:31:47 +0000 (23:31 +0000)]
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev am:
504ea09356
am:
b6dcc03151
Change-Id: Icafc9bff5d067ff38bc371a4f221f790a156ab3f
Andrii Kulian [Fri, 21 Jul 2017 23:30:56 +0000 (23:30 +0000)]
DO NOT MERGE ActivityView be gone! am:
94e82d9b0e
am:
9010731abe -s ours
Change-Id: I27291fb15b805b82375f9770547e97fb64513544
Steven Moreland [Fri, 21 Jul 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
am:
e8341b6148
Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a
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
David Friedman [Fri, 21 Jul 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
cde37c8836
Change-Id: I5939c2e5fcaa87fb68964c8deb037f99b0883e82
Andrii Kulian [Fri, 21 Jul 2017 23:22:18 +0000 (23:22 +0000)]
DO NOT MERGE ActivityView be gone!
am:
94e82d9b0e
Change-Id: I54725b8840f0e839fbb4df5514b03f73a9d80245
Treehugger Robot [Fri, 21 Jul 2017 23:18:09 +0000 (23:18 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
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!
David Friedman [Fri, 21 Jul 2017 23:15:50 +0000 (23:15 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: Iec159fcb65676b0b41de5f0ec29b919fdfa8a14f
David Friedman [Fri, 21 Jul 2017 23:11:16 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: I931088e43f29707e1ab5d9764a06adbbe5af1d7e
David Friedman [Fri, 21 Jul 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: If97a3685c4e55ca006d1876a0378a772bf784c2d
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
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
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 22:06:57 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
1cdf8ff72e -s ours
am:
af3212cff3 -s ours
Change-Id: I9a7adc69b2feebc436aef994e60705a0665ca0af
Bill Yi [Fri, 21 Jul 2017 22:04:51 +0000 (22:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
6acefed3dc -s ours
am:
11da97ccb1 -s ours
Change-Id: I150ef3994183711154c1c61dabd053596da9a874
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
Sudheer Shanka [Fri, 21 Jul 2017 21:51:17 +0000 (14:51 -0700)]
Add all battery related tests to BatteryStatsTests suite.
Bug:
62805443
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: I358e3a143e511a7e2c94380e0ae8edcaddbcc9b4
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:42:46 +0000 (21:42 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8 am:
14be4e65b2 am:
0f18557df8 am:
a3011a0401
am:
8cbab2292e
Change-Id: I03cd2948a0559c06372e664b32d96220a1ec87b8
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
Steven Moreland [Fri, 21 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Revert "Revert "Update for less arguments in hidl toBinder.""
This reverts commit
243bcfda3ac35735a959f8abcc45186aba0af116.
(originally reverted due to merge conflicts)
Bug:
32172906
Test: hidl_test
Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
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
Dake Gu [Fri, 21 Jul 2017 21:10:14 +0000 (21:10 +0000)]
Merge "Initial commit of leanback uibench test" into oc-mr1-dev am:
70bc905201
am:
aa3ee4c88a
Change-Id: I961503644f7d2b5f459d8d3b0c46ab9414bed384
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
Evan Laird [Fri, 21 Jul 2017 20:47:32 +0000 (20:47 +0000)]
Merge "Merge "Update icons in the volume rocker" into oc-dr1-dev am:
cdcbbeccb7 am:
691c2f6ddc" into oc-mr1-dev-plus-aosp
am:
8d746d5e15
Change-Id: I83413f07b02f8a19bbeef9f68d71fbae6f611fc9
Evan Laird [Fri, 21 Jul 2017 20:45:33 +0000 (20:45 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev am:
cdcbbeccb7 am:
5c3bd91fac
am:
4334882c9b
Change-Id: Ifc9b45706d8f6d7f9a5961bc0bc9b7d47dd2072a
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
Fan Zhang [Fri, 21 Jul 2017 20:29:03 +0000 (20:29 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule"
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:17:06 +0000 (20:17 +0000)]
Merge "Fix notification ordering for groups" into oc-mr1-dev am:
03eb6c9934
am:
514bb5f346
Change-Id: Ifb41402688d226dfc8755d2d334ba28deadfc295
Julia Reynolds [Fri, 21 Jul 2017 20:15:39 +0000 (20:15 +0000)]
Merge "Fix xml loading for managed services" into oc-mr1-dev am:
04964fe069
am:
b28a7ed832
Change-Id: I75344079f96cac1ff2318018b09bb6277bd9676e
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 20:04:46 +0000 (20:04 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142 am:
16255fda63 am:
4e743f680e am:
d4d462857b
am:
f2bbdf9280
Change-Id: I397a8bd20a6fba62cfa528c5463dbaaaf2572460
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
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.
Change-Id: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Bug:
63908636
Test: robotests
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
Christine Franks [Fri, 21 Jul 2017 19:33:00 +0000 (19:33 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am:
484115b77d -s ours am:
edc3af3f91 -s ours
am:
c3619bceda -s ours
Change-Id: Ie92d4d8c95da45056261cddadb86ee26f36644fd
Rajeev Kumar [Fri, 21 Jul 2017 19:31:38 +0000 (19:31 +0000)]
Merge "Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev am:
cfc55bb0a6" into oc-mr1-dev-plus-aosp
am:
97c3b26d4e
Change-Id: I1f2b7190b329b5d418f4c3e92b411bf1c011a750
Christine Franks [Fri, 21 Jul 2017 19:29:48 +0000 (19:29 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am:
484115b77d am:
379c317ab8 -s ours
am:
9fddcbae3c -s ours
Change-Id: I6d960b20596d47b9ee603cdd79f99727b8f21a1e
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
Rajeev Kumar [Fri, 21 Jul 2017 19:23:19 +0000 (19:23 +0000)]
Merge "Data plan setting in SystemUI quick settings." into oc-mr1-dev am:
56eec29494
am:
6b9a3fa3c8
Change-Id: If85d881aafa3509263a9c00f653d4fb990001887
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
Christine Franks [Fri, 21 Jul 2017 19:10:32 +0000 (19:10 +0000)]
Merge "Remove RetailDemoModeService" into oc-mr1-dev am:
59d0441b0c
am:
c5662c9aad
Change-Id: I52f2e5d6ae280299bc31230f00acd4814b79c1e8
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
Albert Chaulk [Fri, 21 Jul 2017 19:07:48 +0000 (19:07 +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
am:
da3c7bc604
Change-Id: Ie69e209e1f015c235af3a400da2ac64f73674744
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
Albert Chaulk [Fri, 21 Jul 2017 19:00:28 +0000 (19:00 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev am:
c48e304bbf am:
8cba74a660
am:
4305ab9499
Change-Id: I5d0db4b27ed8e5c99a5817cfc125bb075912670b
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
Christopher Tate [Fri, 21 Jul 2017 18:58:38 +0000 (18:58 +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
am:
8134b836cc
Change-Id: Ifd76bf03097592dd959aee584955d4aa5b23eec0
Steven Moreland [Fri, 21 Jul 2017 18:56:08 +0000 (18:56 +0000)]
Merge "Merge "Update for less arguments in hidl toBinder." am:
602b7be04e am:
b167ed08cc am:
5f04958a73 am:
88901bd0df" into oc-mr1-dev-plus-aosp
am:
8d2396cbbe
Change-Id: I4ed363468d199a69f6594f13626b3f5697f78759
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