Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,831 Commits 3 Branches 0 Tags
861c8740b8a6b806a78a7b8a04a59d5da170b332
Commit Graph

516831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
f87397ce3b Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours" into rvc-dev-plus-aosp am: 016d14586c -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6ad6ca2dbb is in history

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

Change-Id: I504a3df4ea4666d6d3f9c6cf926c49581723e92c
 2020-07-29 23:46:11 +00:00
Kelly Rossmoyer
e9a5aca11d Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f am: e5da315dd7 am: 6ba33c095c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378577

Change-Id: I5aa60a3cec72ee834e8914390e8fa15d2064690f
 2020-07-29 23:45:40 +00:00
Kelly Rossmoyer
3261ea7b0a Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 23:45:17 +00:00
TreeHugger Robot
45c4df598c [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours am: 896e525763 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: I9a9bae750f97701454927bf368f0614df9722223
 2020-07-29 23:35:09 +00:00
Automerger Merge Worker
016d14586c Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours" into rvc-dev-plus-aosp 2020-07-29 23:26:57 +00:00
Kelly Rossmoyer
6ba33c095c Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f am: e5da315dd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378577

Change-Id: I3463b8081b05f431f95f0477f64558d6c9797615
 2020-07-29 23:26:42 +00:00
TreeHugger Robot
896e525763 [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: I28133805738c0ed812205ba9ed7132a2b4429c40
 2020-07-29 23:26:39 +00:00
TreeHugger Robot
d05a7af205 [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: I8bdac82c58cb1fa94a4de23fd1ea14a8ec819890
 2020-07-29 23:26:39 +00:00
Blake Kragten
9c50208f54 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174522

Change-Id: Ibed4b20e1ebe8c0c464a0f068ffaa3dc46ad1764
 2020-07-29 23:26:26 +00:00
Peiyong Lin
7bc64bdf00 Use more inclusive terms. 
BUG: b/162288333
Test: N/A
Change-Id: Icd58adb5eb19395548f20bd9349639e84a0cce88
 2020-07-29 16:23:28 -07:00
Kelly Rossmoyer
e5da315dd7 Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378577

Change-Id: Ic9fbb4297bedaa440c06bd0cb2e8817c6fbd1283
 2020-07-29 23:09:44 +00:00
TreeHugger Robot
5ce7da37ac [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: Ia32604223ea572bca4648e26fff6950a7d37adec
 2020-07-29 23:08:07 +00:00
Blake Kragten
f4c4ca2327 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev 2020-07-29 23:04:16 +00:00
Kelly Rossmoyer
e859848f9f Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 22:52:52 +00:00
Treehugger Robot
923bd83f83 Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523 am: f2f4e95bac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375936

Change-Id: Ia35293005942c7c29b4e18e325889f3eb4319fcb
 2020-07-29 22:50:46 +00:00
TreeHugger Robot
f3640afe28 [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: Ib71d58d8154fda8d580af2a2b81bc44f36777358
 2020-07-29 22:49:37 +00:00
TreeHugger Robot
b8a2504758 Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev 2020-07-29 22:36:15 +00:00
Treehugger Robot
f2f4e95bac Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375936

Change-Id: Id5597b0e732c599413b60bc5c3e739a53f3fe720
 2020-07-29 22:34:17 +00:00
Nicole Borrelli
dd0406becb Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 161896447
Change-Id: I038fbac2bb59e97dc87f082eab98f3838263c909
 2020-07-29 22:31:37 +00:00
Sterling Huber
012db72a2a [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours am: bbe3a8716b -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history

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

Change-Id: Ibd3d0375c4c1e82f266f6ad38f662577365a5d9d
 2020-07-29 22:16:49 +00:00
TreeHugger Robot
40517a5d4d Merge "Decouple FUSE mount from main thread for demo user" into rvc-dev am: 931d7d2703 am: 962b992032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12261202

Change-Id: Ic78f1e602e4ecdb4cd48f53168492cb74c22296f
 2020-07-29 22:16:28 +00:00
Treehugger Robot
1f27abf523 Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375936

Change-Id: I6552529c7fc886725567b0240025eb6bcaa40749
 2020-07-29 22:15:26 +00:00
Adam He
6f773b0fb8 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: 6ebc2cc95a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I601203674b395cb9e91005315ddc68577cb29356
 2020-07-29 22:15:24 +00:00
Sterling Huber
0593d959fa [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours am: bdda889b15 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6bc126b040 is in history

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

Change-Id: I31f456f8e173b4fa1ce93677fcf3ae06e19897a4
 2020-07-29 22:14:23 +00:00
Sterling Huber
bdda889b15 [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6bc126b040 is in history

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

Change-Id: I8513fff42d0c076ad4607d944957fb03e8344099
 2020-07-29 22:14:04 +00:00
TreeHugger Robot
0ee976f434 Merge "Decouple FUSE mount from main thread for demo user" into rvc-dev am: 931d7d2703 am: 4e14ca12d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12261202

Change-Id: Id66cf3dbf9fa342a5a8cc168c0185c76409ad702
 2020-07-29 22:14:04 +00:00
Adam He
adfe4b5116 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 am: f336feb6df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I8c4d50150824f8f64b2c961663e19bf15331acb0
 2020-07-29 22:13:52 +00:00
Sterling Huber
bbe3a8716b [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6bc126b040 is in history

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

Change-Id: I3eca39cb2dbb72962947d782744af237e572c896
 2020-07-29 22:06:39 +00:00
Sterling Huber
f894ada560 [automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours 
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6bc126b040 is in history

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

Change-Id: I24ea514f58bf97e7eb7bd34f22893054e1aeb09d
 2020-07-29 22:06:09 +00:00
TreeHugger Robot
962b992032 Merge "Decouple FUSE mount from main thread for demo user" into rvc-dev am: 931d7d2703 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12261202

Change-Id: Ifc957093c96f71273939e8f1bab5013ad9d0b506
 2020-07-29 22:06:05 +00:00
TreeHugger Robot
4e14ca12d6 Merge "Decouple FUSE mount from main thread for demo user" into rvc-dev am: 931d7d2703 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12261202

Change-Id: I90b8ffbf76d92bebf9404f8f4f41a93f4f6c5d3d
 2020-07-29 22:05:53 +00:00
Treehugger Robot
b6488ac518 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 22:00:41 +00:00
TreeHugger Robot
931d7d2703 Merge "Decouple FUSE mount from main thread for demo user" into rvc-dev 2020-07-29 21:57:54 +00:00
Adam He
6ebc2cc95a Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: Ic53a949c233347006124174fc07f0f802be51fed
 2020-07-29 21:56:38 +00:00
Adam He
f336feb6df Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev am: 3532bdaa36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12175369

Change-Id: I10e813423aa03d7bc6c7b7617da9679fcf27f3b9
 2020-07-29 21:56:20 +00:00
Sterling Huber
190cf66184 Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev 2020-07-29 21:48:47 +00:00
Shuo Qian
2e9efc4976 [automerger skipped] Merge "Change the range checking for ssrsrq" am: abdc06b2d2 am: 3d04a71f12 am: 9328760e16 -s ours 
am skip reason: Change-Id I383f3b5c7b4e89fa7e9cd3be6e77c3d99552b99c with SHA-1 71818ce490 is in history

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

Change-Id: Ia4fb55838c1f7034579352400aeaac2508fb7266
 2020-07-29 21:48:22 +00:00
Orion Hodson
54f25cdfed [automerger skipped] Merge "startop: Add yawanng@ to OWNERS list" am: ee536d0e12 am: 386c2d78bd -s ours am: 6fbb25962e -s ours 
am skip reason: Change-Id Iaee1a3d608593238284c9b07d34d1042538ec612 with SHA-1 ccc3ea7a57 is in history

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

Change-Id: Ie49bd6bfad54ade98f32a0ffff5d5cb47402d9e9
 2020-07-29 21:48:11 +00:00
Adam He
3532bdaa36 Merge "Updated docs with clarifications on specific limitations with the new Inline APIs." into rvc-dev 2020-07-29 21:45:59 +00:00
Shuo Qian
9328760e16 Merge "Change the range checking for ssrsrq" am: abdc06b2d2 am: 3d04a71f12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378016

Change-Id: I6ccc9ea866d1a2ccb41d75bcea0671df64e4f735
 2020-07-29 21:38:11 +00:00
Orion Hodson
6fbb25962e [automerger skipped] Merge "startop: Add yawanng@ to OWNERS list" am: ee536d0e12 am: 386c2d78bd -s ours 
am skip reason: Change-Id Iaee1a3d608593238284c9b07d34d1042538ec612 with SHA-1 ccc3ea7a57 is in history

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

Change-Id: I0bc38946953209dc5b204e7cc9b852e0ab9e564a
 2020-07-29 21:37:30 +00:00
Kelly Rossmoyer
6f37c919ab Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=161896447

Change-Id: I7a081cb7385c6db047c4ba369a91ac409f3ab20f
 2020-07-29 21:22:26 +00:00
Shuo Qian
3d04a71f12 Merge "Change the range checking for ssrsrq" am: abdc06b2d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378016

Change-Id: I0c742ec7f7b41113b1d47260588417a5444ee98e
 2020-07-29 21:10:44 +00:00
Orion Hodson
386c2d78bd Merge "startop: Add yawanng@ to OWNERS list" am: ee536d0e12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378296

Change-Id: I1105b7f1d9bf05a26de7764540c870b67d847473
 2020-07-29 21:10:00 +00:00
Kelly Rossmoyer
4c8a97a8f4 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=161896447

Change-Id: I8d670c2c1aac98f06de3f714a957b08dfd285a0b
 2020-07-29 21:03:05 +00:00
Treehugger Robot
6ea2f0fd7d Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3 am: 3bb5a01e9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375131

Change-Id: I2fa5ecff7b55f6cd643cadbd00ffa36f023d8def
 2020-07-29 20:58:31 +00:00
Shuo Qian
abdc06b2d2 Merge "Change the range checking for ssrsrq" 2020-07-29 20:55:51 +00:00
Orion Hodson
ee536d0e12 Merge "startop: Add yawanng@ to OWNERS list" 2020-07-29 20:48:15 +00:00
Curtis Belmonte
074458830e Use inclusive language in framework core test APKs 
Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Test: atest FrameworksCoreTests
Bug: 161896447
Change-Id: I71bd3e0033829378e6c19864dd084d7b322aca68
 2020-07-29 13:42:55 -07:00
Treehugger Robot
3bb5a01e9c Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375131

Change-Id: If43a1f2c9030915ccadc6f4aaa4d031ce6eae32a
 2020-07-29 20:38:47 +00:00