Commit Graph

637666 Commits

Author SHA1 Message Date
Sudheer Shanka
48bef56569 Merge "Make a couple of constants in MediaSessionService configurable." into sc-dev am: a8c60abc86
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13970331

Change-Id: Ice9205cbb520789697084236effe40ce038e5016
2021-03-29 13:14:09 +00:00
Sudheer Shanka
a8c60abc86 Merge "Make a couple of constants in MediaSessionService configurable." into sc-dev 2021-03-29 12:37:55 +00:00
Selim Cinek
f3cfd3b651 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245 am: 7bd1fed397 am: 396cf5e224
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: Ie46f234d371d2d7f2635f2d8c78a62e49fc4436a
2021-03-29 12:05:17 +00:00
TreeHugger Robot
86f1dd7048 Merge "[Settings] add readable tests to presubmit" into sc-dev am: 894cde1030
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988647

Change-Id: Ibf61eb518156934815b1518b7da04ca4e9d2166e
2021-03-29 12:04:53 +00:00
Peter Li
d3b9b7d0f5 Merge "Add callback to report HotwordDetectionService status" into sc-dev am: 378b540fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13974087

Change-Id: Idc441a5d54c25e58803bc4d8e609c57514a5416f
2021-03-29 12:04:21 +00:00
Selim Cinek
396cf5e224 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245 am: 7bd1fed397
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I52c324890ffdda162d116c40311c95b9c7628dd3
2021-03-29 11:55:59 +00:00
TreeHugger Robot
894cde1030 Merge "[Settings] add readable tests to presubmit" into sc-dev 2021-03-29 11:52:22 +00:00
Peter Li
378b540fa1 Merge "Add callback to report HotwordDetectionService status" into sc-dev 2021-03-29 11:43:29 +00:00
Jeff Chang
7bc66fcdf6 Merge "Update saving persistent state documentation" into sc-dev am: d4a142719e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824390

Change-Id: I38f1ef13cdc7056aa692ba8b3acf6f6414b5ea51
2021-03-29 11:29:52 +00:00
Selim Cinek
7bd1fed397 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I30c4cdd28db679f99eac2f1688270b6ffad35573
2021-03-29 11:09:51 +00:00
Jeff Chang
d4a142719e Merge "Update saving persistent state documentation" into sc-dev 2021-03-29 10:57:28 +00:00
Selim Cinek
386db4c245 Merge "Updating owners of SystemUI" am: 66712466b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I8343f86cdda12c6dd8140eb65a32f7488f8e1ab3
2021-03-29 10:30:29 +00:00
Selim Cinek
66712466b3 Merge "Updating owners of SystemUI" 2021-03-29 09:45:19 +00:00
lpeter
6f2a263810 Add callback to report HotwordDetectionService status
Bug: 182788844
Test: Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Change-Id: I12f0a265fc4fce0bbfe0983f39b4dcd947e3cf64
2021-03-29 17:41:24 +08:00
Nicolas Geoffray
eda1431664 Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460 am: 001d7943cb am: b6521e0a8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: I6dff0ab7675f720e0f088516cdbc0fdf747826bc
2021-03-29 09:24:11 +00:00
Nicolas Geoffray
b40ae1760a Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 am: c17f106404 am: 2e17b07d50 am: 001566a3bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: Ic008c37d1e843ae7e86ec75fa87106f11e3f5fd3
2021-03-29 09:24:07 +00:00
Junyu Lai
d8419f4837 Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 am: a62eb108fa am: d8d97df24f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: I5da5219083eeb9a109d7fd021cc1a12745815f10
2021-03-29 09:22:47 +00:00
Nicolas Geoffray
b6521e0a8b Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460 am: 001d7943cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: I64ebc619fb75e53a25f0f669b59e24413089e94b
2021-03-29 09:05:55 +00:00
Nicolas Geoffray
001566a3bb Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 am: c17f106404 am: 2e17b07d50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: I1fd76cc9165b20dccecea76f747f3a20a3c003bb
2021-03-29 09:05:42 +00:00
Junyu Lai
d8d97df24f Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 am: a62eb108fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
2021-03-29 09:05:02 +00:00
Sean Stout
c5f8e6dd72 Merge "Update Wakelocks to be per-DisplayGroup" into sc-dev am: 97effb798d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13823066

Change-Id: I19cfe7ced235b70e9875b480aae200422defe881
2021-03-29 08:59:16 +00:00
Nicolas Geoffray
001d7943cb Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: Ie1729ab482bb3b3559d66c28b37de7a3cb110679
2021-03-29 08:26:59 +00:00
Nicolas Geoffray
2e17b07d50 Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 am: c17f106404
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: Iee6d1f3bad1c34790af3c954a29aaaebcb00d69c
2021-03-29 08:26:57 +00:00
Junyu Lai
a62eb108fa Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Iaa7d8d3dcb106cd19777fe1ff64db5ab4ea75991
2021-03-29 08:26:07 +00:00
Sean Stout
97effb798d Merge "Update Wakelocks to be per-DisplayGroup" into sc-dev 2021-03-29 08:18:28 +00:00
Nicolas Geoffray
7e6f612460 Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: I400b0c16ee56ed02f1b12d1e5ba55a1f0fffe82b
2021-03-29 08:07:25 +00:00
Nicolas Geoffray
c17f106404 Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: I73ee02845783e7869fc3f941fe2c81bc155f3846
2021-03-29 08:05:43 +00:00
Nicolas Geoffray
f89bea0b69 Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." 2021-03-29 07:47:43 +00:00
Nicolas Geoffray
03faaa5843 Merge "When a pinned file is a jar or apk, ask the runtime for other files." 2021-03-29 07:47:43 +00:00
Junyu Lai
dfcdeef584 Merge "Support Dual ViLTE stats" am: e456a6c3f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Ie65e2a2530b3e10b1cb7b571bbe4e7255caf1b08
2021-03-29 07:37:34 +00:00
Automerger Merge Worker
04716cdbda Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4d7d9c5fce -s ours" into rvc-qpr-dev-plus-aosp am: 8a86026b48 -s ours am: deb450ac8e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011966

Change-Id: Ife2bb2ee422a68c55d36bb32dc6b7566afe1957d
2021-03-29 07:17:18 +00:00
Remi NGUYEN VAN
15175edf6b [automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc am: 77744e5554 am: c86145ce4c -s ours am: 99c88a160f -s ours
am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 bd227ae8c8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I7d5897bbb3d645e5e0e7996e56256d0c15a27179
2021-03-29 07:16:41 +00:00
TreeHugger Robot
027c34a35d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1693fa81d1 -s ours am: 8932720090 -s ours am: 7a829dacd6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14012886

Change-Id: I768047197d18c0222424c706d126c0e344adf21d
2021-03-29 07:15:24 +00:00
Automerger Merge Worker
deb450ac8e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4d7d9c5fce -s ours" into rvc-qpr-dev-plus-aosp am: 8a86026b48 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011966

Change-Id: I732ad844fc7b47ed0700ee23a88800b709dbd7cf
2021-03-29 07:00:16 +00:00
Remi NGUYEN VAN
99c88a160f [automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc am: 77744e5554 am: c86145ce4c -s ours
am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 bd227ae8c8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
2021-03-29 06:59:52 +00:00
Junyu Lai
e456a6c3f8 Merge "Support Dual ViLTE stats" 2021-03-29 06:59:19 +00:00
TreeHugger Robot
7a829dacd6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1693fa81d1 -s ours am: 8932720090 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14012886

Change-Id: I7a66ee2a11d233dd4b6fd4a1983dbbebf463071d
2021-03-29 06:59:02 +00:00
Bill Lin
8b26f0206a Merge "Integrate DisplayLayout for One handed mode" into sc-dev am: 2b2c2a85f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13899080

Change-Id: I411b13cafd876aefadf140ece0e9e0b5dbba06e5
2021-03-29 06:54:11 +00:00
Bill Lin
2b2c2a85f4 Merge "Integrate DisplayLayout for One handed mode" into sc-dev 2021-03-29 06:26:37 +00:00
Automerger Merge Worker
8a86026b48 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4d7d9c5fce -s ours" into rvc-qpr-dev-plus-aosp 2021-03-29 06:15:09 +00:00
TreeHugger Robot
094a8cbeae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4d7d9c5fce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011966

Change-Id: I8cb910ae71260e1029def1640cf8e8bf50e8456e
2021-03-29 06:15:00 +00:00
Remi NGUYEN VAN
c86145ce4c Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc am: 77744e5554
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231
2021-03-29 06:14:57 +00:00
TreeHugger Robot
8932720090 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1693fa81d1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14012886

Change-Id: Ia7dbc6372b9ac23db514ad3ad83cbe578b39ca18
2021-03-29 06:13:58 +00:00
TreeHugger Robot
4d7d9c5fce Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-29 06:00:13 +00:00
TreeHugger Robot
1693fa81d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-29 05:54:21 +00:00
Remi NGUYEN VAN
77744e5554 Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I1dd7913bacf5b92e35ec0a5b14da4d9b40513f21
2021-03-29 05:32:39 +00:00
tim peng
e4ae28d0e9 Merge "Show advanced device icon in Connected devices list by new metadata" into sc-dev am: 2b7fffc5df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921631

Change-Id: I0a279a982d323d3c561dbf2ddfccad698d528b81
2021-03-29 05:09:27 +00:00
Remi NGUYEN VAN
4de248aecc Merge "Re-implement NetworkUtils#queryUserAccess." 2021-03-29 04:57:40 +00:00
Bill Yi
f626cb2127 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-29 04:56:22 +00:00
tim peng
2b7fffc5df Merge "Show advanced device icon in Connected devices list by new metadata" into sc-dev 2021-03-29 04:23:01 +00:00