OSDN Git Service
Bill Yi [Sat, 22 Jul 2017 17:05:31 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
33192787ce -s ours
Change-Id: I2b5f30a86e62d6f8158da6d359dc27615f719e3d
Bill Yi [Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
27489df378 -s ours
Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b
TreeHugger Robot [Sat, 22 Jul 2017 16:55:48 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:05 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 16:46:45 +0000 (16:46 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
69e41a4e9c -s ours am:
b1b04dddef -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sat, 22 Jul 2017 16:45:20 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
69e41a4e9c -s ours
am:
b1b04dddef -s ours
Change-Id: I52cfd424753db44826ff7b81cdbb85ffd4358152
Bill Yi [Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
69e41a4e9c -s ours
am:
3346da7da4 -s ours
Change-Id: I18cc399f3c272ce09f484f31d6aa7affeba00f91
Bill Yi [Sat, 22 Jul 2017 16:39:09 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
69e41a4e9c -s ours
Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c
Bill Yi [Sat, 22 Jul 2017 16:39:06 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
69e41a4e9c -s ours
Change-Id: I0e0cc787032a847d315fac6647e6dd2e9aa9b14f
Android Build Merger (Role) [Sat, 22 Jul 2017 16:34:52 +0000 (16:34 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
86817456ff -s ours am:
fd00212302 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
86817456ff -s ours
am:
fd00212302 -s ours
Change-Id: I0c2e94e311da66ef58e6816ef20c9f8eb5020528
Bill Yi [Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
86817456ff -s ours
am:
4d681e127b -s ours
Change-Id: Ibf37f62606eb31b3dadde411d91a501203a79b3f
TreeHugger Robot [Sat, 22 Jul 2017 16:31:16 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:27:38 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
86817456ff -s ours
Change-Id: I44c91d899d1718557316d1f9bec1d87613d47fbd
Bill Yi [Sat, 22 Jul 2017 16:27:36 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
86817456ff -s ours
Change-Id: I10c9bfb5e9e22e565b29a1a6b6eda86c8c08f31e
TreeHugger Robot [Sat, 22 Jul 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 09:47:35 +0000 (02:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1670c714954e5835f6c79f446c463ee18d72d17b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 09:42:31 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa292630f4aba2e8129bfb6e0bc5de3fcad5d6fb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Sat, 22 Jul 2017 05:02:27 +0000 (05:02 +0000)]
Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am:
a74f575ff9 am:
90ad7d538f" into oc-mr1-dev-plus-aosp
Lucas Dupin [Sat, 22 Jul 2017 05:00:18 +0000 (05:00 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev am:
a74f575ff9
am:
902ba7bab5
Change-Id: Icd8f2b020170e16134947dfd5fdeb4291e9f231c
Lucas Dupin [Sat, 22 Jul 2017 05:00:17 +0000 (05:00 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev am:
a74f575ff9
am:
90ad7d538f
Change-Id: I524cc9f1c547b85dff3e726082aba52e255e9ccc
Lucas Dupin [Sat, 22 Jul 2017 04:52:31 +0000 (04:52 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
am:
a74f575ff9
Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5
Lucas Dupin [Sat, 22 Jul 2017 04:52:29 +0000 (04:52 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
am:
a74f575ff9
Change-Id: Ia9a05c0fe59c2677029fcfc95b1cd648c091d23f
TreeHugger Robot [Sat, 22 Jul 2017 04:46:19 +0000 (04:46 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 03:58:50 +0000 (20:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c164681df192fe74083e69adf301a0f312dc144
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Sat, 22 Jul 2017 03:46:31 +0000 (03:46 +0000)]
Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am:
1cc73a5773 am:
5e4b071704" into oc-mr1-dev-plus-aosp
Matthew Fritze [Sat, 22 Jul 2017 03:44:10 +0000 (03:44 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am:
1cc73a5773
am:
1986c25da7
Change-Id: I7ddd29766ecb6a4315ab635b16b2f480cc4915a8
Matthew Fritze [Sat, 22 Jul 2017 03:43:42 +0000 (03:43 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am:
1cc73a5773
am:
5e4b071704
Change-Id: Id2768c7fbe12ce572dd53e60bb81026fe69e8ba3
Bill Yi [Sat, 22 Jul 2017 03:42:48 +0000 (20:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibde0d25cf7cd630ac63d57c865e906a28739d48a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Matthew Fritze [Sat, 22 Jul 2017 03:37:47 +0000 (03:37 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am:
1cc73a5773
Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598
Matthew Fritze [Sat, 22 Jul 2017 03:37:46 +0000 (03:37 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am:
1cc73a5773
Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b
TreeHugger Robot [Sat, 22 Jul 2017 03:31:53 +0000 (03:31 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
Romain Guy [Sat, 22 Jul 2017 03:08:29 +0000 (03:08 +0000)]
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am:
572cb5242d
Change-Id: I7b79b055f7ffd9a62a741dfe98c71b9fa079b645
TreeHugger Robot [Sat, 22 Jul 2017 03:01:02 +0000 (03:01 +0000)]
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 01:13:50 +0000 (01:13 +0000)]
Merge "NFC DTA Integration am:
b54567810f -s ours am:
3cf0b6926f -s ours am:
58a611b3a2 -s ours" into oc-mr1-dev-plus-aosp
Love Khanna [Sat, 22 Jul 2017 01:12:44 +0000 (01:12 +0000)]
NFC DTA Integration am:
b54567810f -s ours am:
3cf0b6926f -s ours
am:
58a611b3a2 -s ours
Change-Id: I65ce382057bc7aaf1df09d7652a710b6e36a978a
Fan Zhang [Sat, 22 Jul 2017 01:12:17 +0000 (01:12 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
am:
b975b333af
Change-Id: Icdde985be117189f1445bc78f3c94da236fec0df
TreeHugger Robot [Sat, 22 Jul 2017 01:07:36 +0000 (01:07 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 01:06:43 +0000 (01:06 +0000)]
Merge "Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am:
5bbf44e715 am:
d9a8191ad6" into oc-mr1-dev-plus-aosp
Love Khanna [Sat, 22 Jul 2017 01:05:46 +0000 (01:05 +0000)]
NFC DTA Integration am:
b54567810f -s ours
am:
3cf0b6926f -s ours
Change-Id: I4b06a5031f7a69ce88871a0600abe80174e21e23
Makoto Onuki [Sat, 22 Jul 2017 01:05:37 +0000 (01:05 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am:
5bbf44e715
am:
d9a8191ad6
Change-Id: I3d0febcb4f3fea230b928ef067a5a36c14741ad6
Makoto Onuki [Sat, 22 Jul 2017 01:03:39 +0000 (01:03 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am:
5bbf44e715
am:
5eb5ec71fa
Change-Id: I17b1d21e5b7dd5f22a773aa201e0ca42e5038fa6
Love Khanna [Sat, 22 Jul 2017 00:59:17 +0000 (00:59 +0000)]
NFC DTA Integration
am:
b54567810f -s ours
Change-Id: I0a95d61bcc814a922453ebf024f4675367ec8bf0
Makoto Onuki [Sat, 22 Jul 2017 00:58:01 +0000 (00:58 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: I0ca842e1a2c2986c0b6fa9d7eca162cb2cb737af
Makoto Onuki [Sat, 22 Jul 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142
Android Build Merger (Role) [Sat, 22 Jul 2017 00:49:22 +0000 (00:49 +0000)]
Merge "Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am:
2337b3ba84 am:
9de5dc9ba8" into oc-mr1-dev-plus-aosp
Bookatz [Sat, 22 Jul 2017 00:47:47 +0000 (00:47 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am:
2337b3ba84
am:
9de5dc9ba8
Change-Id: I75cafc7f4eac5a8e77b2491cc85f183866f11546
Bookatz [Sat, 22 Jul 2017 00:47:40 +0000 (00:47 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am:
2337b3ba84
am:
63959bae98
Change-Id: I0f2c802fb797541f9a4431f1d798ea9f0f1332c0
TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
Bookatz [Sat, 22 Jul 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am:
2337b3ba84
Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
Bookatz [Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am:
2337b3ba84
Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3
Matthew Fritze [Sat, 22 Jul 2017 00:33:00 +0000 (17:33 -0700)]
Move icon resources into SettingsLib for phone buddy
The external settings api needs to pass icons for
corresponding settings. The following signals didn't have
icons in Settings.
- Night display
- Location
Bug:
62706782
Test: make RunSettingsGoogleRoboTests
Change-Id: Ia2feaa9cfea7dbce165545e5b7d96ad0798b8e07
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 00:26:54 +0000 (00:26 +0000)]
Merge "Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d am:
07e2d89b35" into oc-mr1-dev-plus-aosp
Wyatt Riley [Sat, 22 Jul 2017 00:25:11 +0000 (00:25 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d
am:
07e2d89b35
Change-Id: If6be09131faf3b9956d6f20971be3b74d0f82f6e
Wyatt Riley [Sat, 22 Jul 2017 00:25:07 +0000 (00:25 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:
ec996b381d
am:
0698972585
Change-Id: I4da098db8f5513dc172edef0c1b78508124d1243
Wyatt Riley [Sat, 22 Jul 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: I345871c43857d1d0e01377a50e9745ce3c598955
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
Wyatt Riley [Sat, 22 Jul 2017 00:18:42 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: Ifa49f58660363d78d79eaa3851fe818fb6b75763
Love Khanna [Sat, 22 Jul 2017 00:14:17 +0000 (00:14 +0000)]
NFC DTA Integration
am:
276f9fe619 -s ours
Change-Id: I34e2fa236f5e590f4f21dcc45e1fa8a045c37ade
TreeHugger Robot [Sat, 22 Jul 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
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
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 [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
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
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
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
Romain Guy [Thu, 20 Jul 2017 15:57:07 +0000 (08:57 -0700)]
Expose shared buffer mode/auto refresh on Surface
These features can be set on a surface to reduce perceived latency
at the expense of visible tearing.
Bug:
63858546
Test: Manual, CTS test coming
Change-Id: Ica3f480bd1cb8f77dff57218d2fa8783433d3396
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
Makoto Onuki [Fri, 21 Jul 2017 22:30:35 +0000 (15:30 -0700)]
Persist/pacel # of periodic syncs properly.
(Note it shouldn't be persisting parceled data in the first place. There's
already a bug filed for that.)
Bug
63935632
Test: manaul test
Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
Bookatz [Fri, 21 Jul 2017 16:03:23 +0000 (09:03 -0700)]
Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().
Bug:
62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
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
(cherry picked from commit
4d37a1a1e1ca902b8a65bce64fafa0eeea51a4dd)
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
Wyatt Riley [Mon, 3 Jul 2017 22:14:42 +0000 (15:14 -0700)]
Fix RemoteListenerHelper vs. HAL deadlock
Releasing lock before calling into HAL.
Fixes:
62776535
Bug:
63264577
Test: Build, GNSS location & GnssMeasurement toggling
Reproed issue with test sleep code without fix and passed with.
Change-Id: I44e183e98edd972619a068bbcc95468e9a9cdee1
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
OSDN Git Service
