OSDN Git Service
Chen Xu [Thu, 26 Sep 2019 03:45:27 +0000 (03:45 +0000)]
Merge "Revert "remove symbols from greylist""
TreeHugger Robot [Thu, 26 Sep 2019 02:48:42 +0000 (02:48 +0000)]
Merge "Do not check package if package-equivalent components have set"
JW Wang [Thu, 26 Sep 2019 01:49:34 +0000 (01:49 +0000)]
Merge "Fix testExplicitHealthCheckFailureBeforeExpiry"
TreeHugger Robot [Thu, 26 Sep 2019 00:58:50 +0000 (00:58 +0000)]
Merge "Reorder LocationManager methods"
Jing Ji [Thu, 26 Sep 2019 00:03:07 +0000 (00:03 +0000)]
Merge "Fix a racing condition in ProcessRecord"
TreeHugger Robot [Wed, 25 Sep 2019 23:41:42 +0000 (23:41 +0000)]
Merge "Add a notification when console is active"
Christopher Ferris [Wed, 25 Sep 2019 23:37:19 +0000 (16:37 -0700)]
Merge "Add support for scudo native allocator." am:
8338b11afa am:
9a3af86f6d am:
b37bf7b20f
am:
6184f98dd9
Change-Id: I9b4b38b0389c5e6858b7b691fa866fd4d7e1d1de
Bill Yi [Wed, 25 Sep 2019 23:34:08 +0000 (16:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
3371f4323e -s ours am:
999db9b2fd -s ours
am:
72b6302cac -s ours
am skip reason: subject contains skip directive
Change-Id: I3f167e1ee1db3c55da5f6650e8a82074d841dcb1
Christopher Ferris [Wed, 25 Sep 2019 23:24:55 +0000 (16:24 -0700)]
Merge "Add support for scudo native allocator." am:
8338b11afa am:
9a3af86f6d
am:
b37bf7b20f
Change-Id: I269d51cb1ce327c27074d34fa4ce05883a3fc33b
Bill Yi [Wed, 25 Sep 2019 23:24:45 +0000 (16:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
cd1ef6fddd -s ours am:
27f72a29c7 -s ours
am:
94a3f227ab -s ours
am skip reason: subject contains skip directive
Change-Id: I3b92ba68c233a8d3eab3dfe0344849c55d35172d
Bill Yi [Wed, 25 Sep 2019 23:20:45 +0000 (16:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
890bcfa7ac -s ours am:
132a22ecec -s ours
am:
c75cf1f0c7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie33d521914a2181598c2af34443f5b84a477f81a
Bill Yi [Wed, 25 Sep 2019 23:20:20 +0000 (16:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
3371f4323e -s ours
am:
999db9b2fd -s ours
am skip reason: subject contains skip directive
Change-Id: I02d59e4fe2e0a243e234617e3349d73a6ea09d9a
Bill Yi [Wed, 25 Sep 2019 23:11:42 +0000 (16:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
15995daccf -s ours am:
57ac183257 -s ours
am:
b2497c1d9c -s ours
am skip reason: subject contains skip directive
Change-Id: I3f04e19199cb812b56544a3b4e6962e48de13831
Soonil Nagarkar [Wed, 25 Sep 2019 22:59:44 +0000 (15:59 -0700)]
Reorder LocationManager methods
Group LocationManager methods by function. No other changes beyond
copy/pasting methods (and fixing lint error).
Bug:
141644661
Test: builds
Change-Id: I95e1297e37aa862cb9ff8fad9052079f056a2973
Bill Yi [Wed, 25 Sep 2019 23:08:53 +0000 (16:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
cd1ef6fddd -s ours
am:
27f72a29c7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdb12beca52d86abf771c16c5f317f9d5e8e161c
Bill Yi [Wed, 25 Sep 2019 23:07:22 +0000 (16:07 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
b485460e3a -s ours am:
5d3144be09 -s ours
am:
e753d3c959 -s ours
am skip reason: subject contains skip directive
Change-Id: I12327d13c571a9d84d470d1c1bda03dce7893a43
Bill Yi [Wed, 25 Sep 2019 23:05:05 +0000 (16:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
890bcfa7ac -s ours
am:
132a22ecec -s ours
am skip reason: subject contains skip directive
Change-Id: I8a91db4da2b410c9eb18e2b14f497b33d4538b17
Bill Yi [Wed, 25 Sep 2019 23:00:54 +0000 (16:00 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
15995daccf -s ours
am:
57ac183257 -s ours
am skip reason: subject contains skip directive
Change-Id: I6736fe6855da88c230137879739b39955c237065
Christopher Ferris [Wed, 25 Sep 2019 23:00:36 +0000 (16:00 -0700)]
Merge "Add support for scudo native allocator." am:
8338b11afa
am:
9a3af86f6d
Change-Id: I5c97711f9f4901e6cefd171121cb4662a7951eff
Lucas Dupin [Wed, 25 Sep 2019 22:57:15 +0000 (15:57 -0700)]
Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am:
9c743a222d" into qt-qpr1-dev-plus-aosp
am:
33094b44d8
Change-Id: I808e7fb137d8a7e3e7d67235db4adecdb0fc23dc
Bill Yi [Wed, 25 Sep 2019 22:57:08 +0000 (15:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
3371f4323e -s ours
am skip reason: subject contains skip directive
Change-Id: I36e443b0c72f0fbba9f7a9cbeed06b9b02747cd2
Bill Yi [Wed, 25 Sep 2019 22:53:42 +0000 (15:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f82c8527ab -s ours am:
4411ca0540 -s ours
am:
74b8c53db9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia134373e31271278c043eceeb1931b312f29c4da
Bill Yi [Wed, 25 Sep 2019 22:52:54 +0000 (15:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
cd1ef6fddd -s ours
am skip reason: subject contains skip directive
Change-Id: I67b3d208b02e3095a7c21632d3b09244a499dc5f
Bill Yi [Wed, 25 Sep 2019 22:51:12 +0000 (15:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
b485460e3a -s ours
am:
5d3144be09 -s ours
am skip reason: subject contains skip directive
Change-Id: I131c03900e8939eadd6c15f849dd66ea24b4e9dd
Bill Yi [Wed, 25 Sep 2019 22:47:06 +0000 (15:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
890bcfa7ac -s ours
am skip reason: subject contains skip directive
Change-Id: I9b9c8a40ab1a81893b4479de68aadc9a13c5f57e
Android Build Merger (Role) [Wed, 25 Sep 2019 22:46:28 +0000 (22:46 +0000)]
Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am:
9c743a222d" into qt-qpr1-dev-plus-aosp
Colin Cross [Wed, 25 Sep 2019 22:45:52 +0000 (15:45 -0700)]
Merge "Merge "Set min_sdk_version for SystemUISharedLib" am:
ce2417fa9c" into stage-aosp-master am:
0bda334b4f am:
1918e5cb87
am:
e656874137
Change-Id: Iab883fda28814388b9844a2e55b2ef14692f7d78
Bill Yi [Wed, 25 Sep 2019 22:45:26 +0000 (15:45 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f82c8527ab -s ours
am:
4411ca0540 -s ours
am skip reason: subject contains skip directive
Change-Id: I4cb68d51b0dd9dffff66cd851a0d2f48eb1b304d
Christopher Ferris [Wed, 25 Sep 2019 22:45:03 +0000 (15:45 -0700)]
Merge "Add support for scudo native allocator."
am:
8338b11afa
Change-Id: Ic7d49e5d3789c3a061f50c12481572f27fa59b5e
Lucas Dupin [Wed, 25 Sep 2019 22:44:58 +0000 (15:44 -0700)]
Merge "Fix wrong Notification refactor" into qt-qpr1-dev
am:
9c743a222d
Change-Id: Ia329bece21b35d6379fbed7c72900ec7b0945131
Bill Yi [Wed, 25 Sep 2019 22:43:00 +0000 (15:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
15995daccf -s ours
am skip reason: subject contains skip directive
Change-Id: I94fea496d08b5d61d31a895e78b2cc8617205fb7
Bill Yi [Wed, 25 Sep 2019 22:38:20 +0000 (15:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
b485460e3a -s ours
am skip reason: subject contains skip directive
Change-Id: I74a96eb2183b2c6006db8c0f53a5e4221ffea88f
Bill Yi [Wed, 25 Sep 2019 22:36:08 +0000 (15:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
eadfdeb249 -s ours am:
254132b362 -s ours
am:
1da3106efe -s ours
am skip reason: subject contains skip directive
Change-Id: If41a15026e5a343049aade9a006a95c53d2d17aa
TreeHugger Robot [Wed, 25 Sep 2019 22:35:36 +0000 (22:35 +0000)]
Merge "Fix wrong Notification refactor" into qt-qpr1-dev
Christopher Ferris [Wed, 25 Sep 2019 22:34:37 +0000 (22:34 +0000)]
Merge "Add support for scudo native allocator."
Bill Yi [Wed, 25 Sep 2019 22:33:41 +0000 (15:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
f82c8527ab -s ours
am skip reason: subject contains skip directive
Change-Id: Ie3b8d4d9f06a4eb0a14f3ffefc28ca0fbbb4796c
Bill Yi [Wed, 25 Sep 2019 22:33:14 +0000 (15:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c57260d52e -s ours am:
a4f119396f -s ours
am:
6c52ea4e42 -s ours
am skip reason: subject contains skip directive
Change-Id: I92ad7b68a83fcd2207c39a7f558ec20762536284
Colin Cross [Wed, 25 Sep 2019 22:30:58 +0000 (15:30 -0700)]
Merge "Merge "Set min_sdk_version for SystemUISharedLib" am:
ce2417fa9c" into stage-aosp-master am:
0bda334b4f
am:
1918e5cb87
Change-Id: I81f2cb5421671c310d01819b375ff3866dc6046e
Bill Yi [Wed, 25 Sep 2019 22:26:47 +0000 (15:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
eadfdeb249 -s ours
am:
254132b362 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f02cfda4f02125c10f18c921eacb9d2472d3f3c
TreeHugger Robot [Wed, 25 Sep 2019 22:26:07 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Wed, 25 Sep 2019 22:22:24 +0000 (22:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Colin Cross [Wed, 25 Sep 2019 22:21:36 +0000 (15:21 -0700)]
Merge "Merge "Set min_sdk_version for SystemUISharedLib" am:
ce2417fa9c" into stage-aosp-master
am:
0bda334b4f
Change-Id: I5bf5a3f4c6278d0aabf671474d549734cf128356
Bill Yi [Wed, 25 Sep 2019 22:20:54 +0000 (15:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c57260d52e -s ours
am:
a4f119396f -s ours
am skip reason: subject contains skip directive
Change-Id: I2d5c98b3be7dd055b46a1bccfa568dca574308d6
Bill Yi [Wed, 25 Sep 2019 22:17:28 +0000 (15:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
eadfdeb249 -s ours
am skip reason: subject contains skip directive
Change-Id: I4570da735d4c7bf63c17bd0e8486c884c854d350
TreeHugger Robot [Wed, 25 Sep 2019 22:13:20 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Wed, 25 Sep 2019 22:13:12 +0000 (15:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c57260d52e -s ours
am skip reason: subject contains skip directive
Change-Id: I59664e73998d09b69dd89f8c7dadeb691de5064d
TreeHugger Robot [Wed, 25 Sep 2019 22:10:01 +0000 (22:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Wed, 25 Sep 2019 22:08:26 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Wed, 25 Sep 2019 22:08:12 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Soonil Nagarkar [Wed, 25 Sep 2019 22:08:07 +0000 (22:08 +0000)]
Merge "Add Executor APIs to LocationManager"
Android Build Merger (Role) [Wed, 25 Sep 2019 22:08:07 +0000 (22:08 +0000)]
Merge "Merge "Set min_sdk_version for SystemUISharedLib" am:
ce2417fa9c" into stage-aosp-master
TreeHugger Robot [Wed, 25 Sep 2019 22:07:30 +0000 (22:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Colin Cross [Wed, 25 Sep 2019 22:07:22 +0000 (15:07 -0700)]
Merge "Set min_sdk_version for SystemUISharedLib"
am:
ce2417fa9c
Change-Id: I175b6e39fd04f56faa03e3730144b49c1b14ef35
Eran Messeri [Wed, 25 Sep 2019 22:02:31 +0000 (22:02 +0000)]
Merge "API for individual attestation"
TreeHugger Robot [Wed, 25 Sep 2019 22:02:06 +0000 (22:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Treehugger Robot [Wed, 25 Sep 2019 21:51:21 +0000 (21:51 +0000)]
Merge "Set min_sdk_version for SystemUISharedLib"
Wei Wang [Wed, 25 Sep 2019 03:55:15 +0000 (20:55 -0700)]
Add a notification when console is active
Performance is largely impacted when console is running, and device
should not ship with that configuration. Moreover, we have seen cases,
when performance of new features was tested with UART on. This CL adds a
notification when console service is active indicating UART is on.
Fixes:
119623211
Test: Enable UART and see warning after boot
Test: Disable UART and no warning
Change-Id: Ie60f763088a15608027986ac855466eb7fc97264
Hongwei Wang [Wed, 25 Sep 2019 21:22:59 +0000 (21:22 +0000)]
Merge "Moves shelf offset into SysUI package"
Evan Laird [Wed, 25 Sep 2019 21:18:18 +0000 (14:18 -0700)]
Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89 am:
2f373bfb5f -s ours
am:
c84de55941 -s ours
am skip reason: subject contains skip directive
Change-Id: I293c2fcb63d31615b2aa508b3b56d0cb20f2cee7
Android Build Merger (Role) [Wed, 25 Sep 2019 21:16:21 +0000 (21:16 +0000)]
Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89 -s ours am:
b069e83cfe -s ours am:
eccf86be7f -s ours am skip reason: subject contains skip directive"
Christine Tsai [Wed, 25 Sep 2019 21:16:12 +0000 (21:16 +0000)]
Merge "Add State to statsd config language"
Evan Laird [Wed, 25 Sep 2019 21:15:37 +0000 (14:15 -0700)]
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89 -s ours am:
b069e83cfe -s ours
am:
eccf86be7f -s ours
am skip reason: subject contains skip directive
Change-Id: Ife4d94ce942afae9bd757afdfec251a11361d12f
Jing Ji [Wed, 25 Sep 2019 21:04:33 +0000 (14:04 -0700)]
Fix a racing condition in ProcessRecord
Bug:
141602830
Test: n/a
Change-Id: I9d67d0733a2eb7f42e23b22ccdc3f3d9b2526ef4
Android Build Merger (Role) [Wed, 25 Sep 2019 21:05:41 +0000 (21:05 +0000)]
Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89 am:
2f373bfb5f -s ours am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1
83c87e50b1 is in history" into qt-qpr1-dev-plus-aosp
Evan Laird [Wed, 25 Sep 2019 21:04:57 +0000 (14:04 -0700)]
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89
am:
2f373bfb5f -s ours
am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1
83c87e50b1 is in history
Change-Id: I66072b4eea18d7813712b831d113b6f7af3cdb8f
Evan Laird [Wed, 25 Sep 2019 21:03:49 +0000 (14:03 -0700)]
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
a3b5dd1b89 -s ours
am:
b069e83cfe -s ours
am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1
83c87e50b1 is in history
Change-Id: Iae5e9db541805d8c022ec8dea91fe53fcb037b31
Soonil Nagarkar [Mon, 23 Sep 2019 18:58:52 +0000 (11:58 -0700)]
Add Executor APIs to LocationManager
Add executor support for all LM APIs and consolidate various GNSS
listeners. Also fixes some edge cases around multithreaded listener
callback delivery.
Bug:
136212299
Test: Manual
Change-Id: I2e863e41de846e739654362e859b58a5ed45c673
Evan Laird [Wed, 25 Sep 2019 20:51:40 +0000 (13:51 -0700)]
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
am:
a3b5dd1b89 -s ours
am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1
83c87e50b1 is in history
Change-Id: Ieaa24de8d2c65314e146ae9b447731db61d44020
Evan Laird [Wed, 25 Sep 2019 20:51:39 +0000 (13:51 -0700)]
DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
am:
a3b5dd1b89
Change-Id: Ic24216fda7cd9359ffa88c49b95c8188aa5b3e19
Christopher Ferris [Wed, 18 Sep 2019 17:42:23 +0000 (10:42 -0700)]
Add support for scudo native allocator.
Bug:
137795072
Test: dumpsys meminfo <PID> and verified non-zero return for Native Heap
Test: using jemalloc and using scudo.
Change-Id: I418c89eaf2eb21d64f008435fa588d22523ffdbd
TreeHugger Robot [Wed, 25 Sep 2019 20:15:13 +0000 (20:15 +0000)]
Merge "[SfStats] Implement global atom puller for SfStats"
Anna Trostanetski [Wed, 25 Sep 2019 19:35:26 +0000 (12:35 -0700)]
Merge "Add package name based APIs to PlatformCompat." am:
ef530d9fa4 am:
29a23e753a am:
0a96b3aff3
am:
6dd3bf2e50
Change-Id: Id6ca3662746565a63f6a5db4fa4f67227b9215da
Anna Trostanetski [Wed, 25 Sep 2019 19:28:52 +0000 (12:28 -0700)]
Merge "Add package name based APIs to PlatformCompat." am:
ef530d9fa4 am:
29a23e753a
am:
0a96b3aff3
Change-Id: I6844ad19650aef716339e2b6a1d91cfe93f0115a
Ned Burns [Wed, 25 Sep 2019 19:26:16 +0000 (19:26 +0000)]
Merge "Add basic initializer for new notification pipeline"
Anna Trostanetski [Wed, 25 Sep 2019 19:21:48 +0000 (12:21 -0700)]
Merge "Add package name based APIs to PlatformCompat." am:
ef530d9fa4
am:
29a23e753a
Change-Id: I1872639b936ddd40a0b4aa75b418faec4d04f308
TreeHugger Robot [Wed, 25 Sep 2019 19:10:40 +0000 (19:10 +0000)]
Merge "Statsd unit tests: clear data on disk after tests"
Anna Trostanetski [Wed, 25 Sep 2019 19:04:33 +0000 (12:04 -0700)]
Merge "Add package name based APIs to PlatformCompat."
am:
ef530d9fa4
Change-Id: Ib6e31e0439efd856cc834ee5590e2419c25f3197
tsaichristine [Tue, 27 Aug 2019 21:45:10 +0000 (14:45 -0700)]
Add State to statsd config language
Introduce State, StateMapping, StateGroup, and MetricStateLink into the
statsd config language and add a slice_by_state field in CountMetrics
for singular and aggregate state slicing.
Bug:
136566566
Test: bit statsd_test:*
Change-Id: Icbb50f25d1c9f5bec0a2f07e6b977820ade289e6
Ricky Wai [Wed, 25 Sep 2019 18:47:45 +0000 (11:47 -0700)]
Merge "Do not return synthetic launcher activity for completely headless apps" am:
835504011f am:
ede2e771f5 am:
125fa919fa
am:
2736876f48
Change-Id: I57c52b7c92d499f79b3c7e41a2035031fa35932f
TreeHugger Robot [Wed, 25 Sep 2019 18:45:13 +0000 (18:45 +0000)]
Merge "Whitelist packages for user types"
Android Build Merger (Role) [Wed, 25 Sep 2019 18:43:21 +0000 (18:43 +0000)]
Merge "Merge "Use APEX boot image for profilebootclasspath" am:
0726986b7c am:
d10fe94410 am:
572ba49fd3 am:
9051b2d6c0"
TreeHugger Robot [Wed, 25 Sep 2019 18:43:11 +0000 (18:43 +0000)]
Merge "Use res value for max bubbles & elevation"
Mathieu Chartier [Wed, 25 Sep 2019 18:42:36 +0000 (11:42 -0700)]
Merge "Use APEX boot image for profilebootclasspath" am:
0726986b7c am:
d10fe94410 am:
572ba49fd3
am:
9051b2d6c0
Change-Id: Ifddb243151e4cccc29d332564133a7008c8958a3
Philip P. Moltmann [Wed, 25 Sep 2019 18:39:34 +0000 (11:39 -0700)]
Merge "Put package name in extra not data" into qt-qpr1-dev am:
f94fa065d1
am:
f33b6733c7
Change-Id: I30c6056d3e99addaae9b27046b1bbcbd74fe2f86
Evan Laird [Wed, 25 Sep 2019 18:36:45 +0000 (11:36 -0700)]
[automerger skipped] Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev am:
99c07af2bf
am:
bf54f5ec8b -s ours
am skip reason: subject contains skip directive
Change-Id: Icc982cf37d14446ad0a988bcf46def7b7387d56b
Ricky Wai [Wed, 25 Sep 2019 18:32:43 +0000 (11:32 -0700)]
Merge "Do not return synthetic launcher activity for completely headless apps" am:
835504011f am:
ede2e771f5
am:
125fa919fa
Change-Id: Ia2d681d6539246a9611e72a66d97c8b3eabb59c2
Evan Laird [Wed, 25 Sep 2019 18:32:42 +0000 (11:32 -0700)]
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am:
83c87e50b1
am:
e9644676ca -s ours
am skip reason: subject contains skip directive
Change-Id: If80d093b4083a4d98b7ef528012827c3a29f4d8c
Anna Trostanetski [Wed, 25 Sep 2019 18:31:49 +0000 (18:31 +0000)]
Merge "Add package name based APIs to PlatformCompat."
Mathieu Chartier [Wed, 25 Sep 2019 18:27:40 +0000 (11:27 -0700)]
Merge "Use APEX boot image for profilebootclasspath" am:
0726986b7c am:
d10fe94410
am:
572ba49fd3
Change-Id: Id9100b957171921dedb9c798d94712e3dd872190
Philip P. Moltmann [Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)]
Merge "Put package name in extra not data" into qt-qpr1-dev
am:
f94fa065d1
Change-Id: I56a380f33f454a6aa575a2029cdcceb4470ec89b
Ricky Wai [Wed, 25 Sep 2019 18:23:35 +0000 (11:23 -0700)]
Merge "Do not return synthetic launcher activity for completely headless apps" am:
835504011f
am:
ede2e771f5
Change-Id: I8fc9ed53ec1441411df4a377288e285870815c3a
Evan Laird [Wed, 25 Sep 2019 18:19:46 +0000 (11:19 -0700)]
Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev
am:
99c07af2bf
Change-Id: I83e8d4e286a5c9e36cafdf537cee31bf0df40657
Evan Laird [Wed, 25 Sep 2019 18:19:45 +0000 (11:19 -0700)]
DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
am:
83c87e50b1
Change-Id: I8b50847dc8d6150f89d51f52494eb328b4b62f28
Mathieu Chartier [Wed, 25 Sep 2019 18:19:41 +0000 (11:19 -0700)]
Merge "Use APEX boot image for profilebootclasspath" am:
0726986b7c
am:
d10fe94410
Change-Id: If36eebf790e97f102667afd5075597844c29e229
Chandan Nath [Wed, 25 Sep 2019 18:18:28 +0000 (18:18 +0000)]
Merge "Route backup data through IntermediateEncryptingTransport"
TreeHugger Robot [Wed, 25 Sep 2019 18:15:04 +0000 (18:15 +0000)]
Merge "ProtoLog improvements"
Ricky Wai [Wed, 25 Sep 2019 18:12:40 +0000 (11:12 -0700)]
Merge "Do not return synthetic launcher activity for completely headless apps"
am:
835504011f
Change-Id: I6f3a7ad712fb73c3ec0983dc4ea8bbd11ae4e56c
Mathieu Chartier [Wed, 25 Sep 2019 18:06:10 +0000 (11:06 -0700)]
Merge "Use APEX boot image for profilebootclasspath"
am:
0726986b7c
Change-Id: Ia2750e553a0e8e1f019b5fce57dc5817231f9461
Long Ling [Wed, 25 Sep 2019 18:04:00 +0000 (18:04 +0000)]
Merge "Move AmbientFilter from whitebalance to utils"
Philip P. Moltmann [Wed, 25 Sep 2019 18:02:16 +0000 (18:02 +0000)]
Merge "Put package name in extra not data" into qt-qpr1-dev
OSDN Git Service
