Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelly Rossmoyer
c19fd3c4cb Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: If391531e878e43b8856b230d3b5a12fb0e5492e1
 2020-09-11 03:53:49 +00:00
Treehugger Robot
b2474e5f88 Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 am: 56f0f3a67b am: 370924cafc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: I0915314f856a010900a8a2f0699f4461014106a0
 2020-09-11 03:50:37 +00:00
Xin Li
8db7491422 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: a9f9ccbc9a -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
 2020-09-11 03:33:28 +00:00
Kelly Rossmoyer
9f1608f214 Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: I53214a146b055f9866ccafcffa395fb1a2dc94a3
 2020-09-11 02:18:09 +00:00
Treehugger Robot
370924cafc Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 am: 56f0f3a67b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: Id4a31178da347a03bb3b1029921ce553712468d1
 2020-09-11 02:16:20 +00:00
Xin Li
a9f9ccbc9a [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
 2020-09-11 02:02:37 +00:00
Kelly Rossmoyer
779a1aedd5 Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: I1675a1ac16f0f0529ba28a96f8351cee043538f6
 2020-09-11 01:12:37 +00:00
Treehugger Robot
56f0f3a67b Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: I6b67e46aa5b421f974578fdd1b194d6166d50875
 2020-09-11 01:05:05 +00:00
Anton Hansson
e9f6722113 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 am: 2547a73809 am: 16ae100af1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: Ib71783df8c42a3a711b9503195ac93167e0dee7f
 2020-09-11 00:41:14 +00:00
Xin Li
b9db5b54f6 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: I4556c20984240fd32561e6b70f772b94934e5908
 2020-09-11 00:40:06 +00:00
Anton Hansson
16ae100af1 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 am: 2547a73809 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: Id6c2b2d2530b2fb598c8c691c126e7caa66b19fc
 2020-09-11 00:08:01 +00:00
Anton Hansson
2547a73809 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: I07af3c4a688a105376ce4297f7f8e967a18f13ec
 2020-09-10 23:23:26 +00:00
Kelly Rossmoyer
f8476d358f Merge "Update language to comply with Android's inclusive language guidance" 2020-09-10 23:07:11 +00:00
Treehugger Robot
4fb19f1550 Merge "Expose some carrier config keys for RTT" 2020-09-10 21:39:25 +00:00
TreeHugger Robot
6b45a17630 Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 am: 1e8a01448d am: bd8649d66c am: c6a5f6fd9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: I2a876a183cd84ca8a46ce36626320abfd625960d
 2020-09-10 20:59:45 +00:00
TreeHugger Robot
907eaa3230 Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 am: 1e8a01448d am: bd8649d66c am: 34a6d52ba6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: I53b2d167fd20768f15d4990474dc6da70c1f5da9
 2020-09-10 20:57:08 +00:00
Kelly Rossmoyer
2837883e87 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make (change is only comments + 1 log message)

Change-Id: I8a21ef4ce19c517853388d8f7542f3a0cf8d91d5
Merged-In: I26ef8e079bf13f19bdc3bbc8219f572a43b68090
 2020-09-10 13:55:33 -07:00
TreeHugger Robot
c6a5f6fd9d Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 am: 1e8a01448d am: bd8649d66c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: I0c10c49592bdaa7ccba61c0242cf2c7b9424e1de
 2020-09-10 20:14:58 +00:00
TreeHugger Robot
34a6d52ba6 Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 am: 1e8a01448d am: bd8649d66c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: I547eb848667931a21ac8cae36588242d9c4a572c
 2020-09-10 20:14:21 +00:00
TreeHugger Robot
bd8649d66c Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 am: 1e8a01448d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: Ie02d43b83066ceebc2368c87f77db394f855e227
 2020-09-10 19:47:13 +00:00
Hall Liu
6c0206ae4f Expose some carrier config keys for RTT 
These keys were added at some point in the past when the API window for
a release had already passed. Expose these constants for use by apps.

Fixes: 149906782
Test: NA -- constants only
Change-Id: I34c34b05f559ab3424bce42ec61bae3572ff6f8d
 2020-09-10 12:22:20 -07:00
Treehugger Robot
1fc702f88f Merge "Change Czech keyboard default layout to qwertz" am: 23ddddef15 am: c4f395d361 am: 2578c2aa74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417617

Change-Id: I188505b7195daf3430d30d404bec495391fd8b01
 2020-09-10 19:09:28 +00:00
TreeHugger Robot
1e8a01448d Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 am: 04a48ca0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: Ic1659e7490ccd09964b793b84f8c466ddb562344
 2020-09-10 18:52:50 +00:00
Treehugger Robot
2578c2aa74 Merge "Change Czech keyboard default layout to qwertz" am: 23ddddef15 am: c4f395d361 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417617

Change-Id: I776226d3294bb721908a8080ac51b05e46fda287
 2020-09-10 18:40:53 +00:00
TreeHugger Robot
04a48ca0e7 Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd am: d08edccaf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: Iedf41c30950c1c0210d6b5fbda7d6a5a40ace676
 2020-09-10 18:30:07 +00:00
Treehugger Robot
c4f395d361 Merge "Change Czech keyboard default layout to qwertz" am: 23ddddef15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417617

Change-Id: I72dfc4f664c397c254c5106603616faa152da8cf
 2020-09-10 18:11:29 +00:00
TreeHugger Robot
d08edccaf0 Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev am: dcc3d1d5fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12524366

Change-Id: Ibdc1bfccd6f315dd75946817b72075d399807d7d
 2020-09-10 17:58:57 +00:00
Xin Li
8ac6741e47 Merge "Merge Android R" 2020-09-10 17:22:01 +00:00
Anton Hansson
3de940cc40 Merge "Add owners file for all bp files in apex subdir" 2020-09-10 17:19:35 +00:00
Treehugger Robot
23ddddef15 Merge "Change Czech keyboard default layout to qwertz" 2020-09-10 16:40:20 +00:00
TreeHugger Robot
dcc3d1d5fd Merge "Accept repeated locale as an input of LocaleList construction." into oc-mr1-dev 2020-09-10 16:30:07 +00:00
Bradley Allen
6d7feae66c Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc am: e2cc59d76c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: I898e1a4a7fbf8f093c361f8159d019103e09d77b
 2020-09-10 16:03:45 +00:00
Bradley Allen
86b4867913 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc am: 7fad6c94d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: I5c439afb2294cbae80660178dce46d4f2cd3300a
 2020-09-10 16:02:36 +00:00
Bradley Allen
e2cc59d76c Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: Ic39b3b9ffd4338b4fcd060fd628411b5beceb060
 2020-09-10 15:52:28 +00:00
Bradley Allen
7fad6c94d6 Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev am: 5d7be413bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548368

Change-Id: Ib44d0aee6a87a79dcc668337c945d67678e4c43d
 2020-09-10 15:51:51 +00:00
Anton Hansson
14eba557fb Add owners file for all bp files in apex subdir 
This is a frequent area of build refactoring.

Test: No
Change-Id: I7582fc3bfa00d2bff74012d6aa31a4b236b916f8
 2020-09-10 16:28:08 +01:00
Bradley Allen
5d7be413bc Merge "docs: Added links to the Android 11 summary pages on developer.android.com." into rvc-dev 2020-09-10 15:23:01 +00:00
Xin Li
c64112eb97 Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
 2020-09-09 20:21:10 -07:00
TreeHugger Robot
92a87221df Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415 am: 5406da5a50 am: 21aa2cb61f am: dee00417b7 am: e381852194 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: Ia983391a181ab7f53d542a1298c80d1fe6b0c9b3
 2020-09-10 02:33:46 +00:00
TreeHugger Robot
b3b2e3b3fd Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2d8 am: e059ae5659 am: 77bc18485c am: a2ec44b2a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512682

Change-Id: I8bd51bd6208e2c15795291fdb1bf16f0210dc263
 2020-09-10 02:33:31 +00:00
TreeHugger Robot
7096ea5112 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415 am: 5406da5a50 am: 21aa2cb61f am: dee00417b7 am: 40dca4110b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I89beed51e2d7c6fee521c82588648fe8bd6c51e3
 2020-09-10 02:16:10 +00:00
TreeHugger Robot
f75ea07024 Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2d8 am: e059ae5659 am: 77bc18485c am: e582a90c19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512682

Change-Id: I57bb4cb00a127fc26e58d9bfd2a85c85f7fc85d6
 2020-09-10 02:15:46 +00:00
TreeHugger Robot
e381852194 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415 am: 5406da5a50 am: 21aa2cb61f am: dee00417b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I590a959a4a5b6772204c6049ceb447b8ac82e9ec
 2020-09-10 02:07:26 +00:00
TreeHugger Robot
40dca4110b Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 am: 9d81730088 am: 71151c2788 am: c98bb7e415 am: 5406da5a50 am: 21aa2cb61f am: dee00417b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: Ib5f82abfd1813e025411b4b80422c8c665799477
 2020-09-10 02:07:00 +00:00
TreeHugger Robot
a2ec44b2a9 Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2d8 am: e059ae5659 am: 77bc18485c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512682

Change-Id: I7b4112e65d4cadfad2e5eb2289b3a79306d8c221
 2020-09-10 02:06:58 +00:00
TreeHugger Robot
e582a90c19 Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2d8 am: e059ae5659 am: 77bc18485c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512682

Change-Id: Ifc27e87a2a1e62e167f3c753fe4df29244d6f002
 2020-09-10 02:06:26 +00:00
TreeHugger Robot
a4ddd72b36 [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours am: a580cdd025 -s ours am: 4e30ab99c5 -s ours 
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

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

Change-Id: Ib6c28ed8879a95517b7b07519d1ea258d80b6478
 2020-09-10 02:00:16 +00:00
TreeHugger Robot
ae30e8804a [automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours am: a580cdd025 -s ours am: 45f2c24dbe -s ours 
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history

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

Change-Id: I51b6648c373639a0c9e4d64e2b26736f47038278
 2020-09-10 01:59:49 +00:00
Automerger Merge Worker
1a4fed1ace Merge "[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours am: ace84bf09f -s ours" into rvc-d1-dev-plus-aosp 2020-09-10 01:59:35 +00:00
TreeHugger Robot
4df28b66ea [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours am: 16b8f33c6e -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history

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

Change-Id: I235447b402e1c2d2706eeab87e1be4de5bb4db4f
 2020-09-10 01:59:24 +00:00