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
Nate Jiang
5be65d0810 Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" 2020-07-31 00:40:33 +00:00
TreeHugger Robot
8ca5e731c8 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f74 -s ours am: f46c693865 -s ours am: 7e508f03df -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 dd9b2c4238 is in history

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

Change-Id: Icb22c4fcd4a71aaf412c5be18ec456a287398352
 2020-07-30 22:25:41 +00:00
TreeHugger Robot
af212e894a [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 am: 937fc47c7f -s ours am: bb590a3114 -s ours am: 0b6db89d78 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 dd9b2c4238 is in history

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

Change-Id: Ia7a601f4c51f9041d525feecd81c4b378e54de8f
 2020-07-30 22:25:32 +00:00
Yu-Han Yang
359c07be65 [automerger skipped] DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae am: e75846a203 -s ours am: 019b545156 -s ours am: bbe4ef7b4b -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 dd9b2c4238 is in history

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

Change-Id: Iee0aad972e72c0af5b777d2bb0a371190fd4c67c
 2020-07-30 22:25:30 +00:00
TreeHugger Robot
f3f93ad4d1 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f74 -s ours am: f46c693865 -s ours am: 40bac5592f -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 2b313d61ae is in history

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

Change-Id: If095ab1ad9e0b9d6b2b6273fc83fc4597665a2a0
 2020-07-30 22:24:54 +00:00
TreeHugger Robot
29bc9b7251 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 am: 937fc47c7f -s ours am: bb590a3114 -s ours am: f74f12f3c8 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: Ia5a822106d3fa13e0b14a5a637da8af0b007d861
 2020-07-30 22:24:37 +00:00
Yu-Han Yang
eb9353018e [automerger skipped] DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae am: e75846a203 -s ours am: 019b545156 -s ours am: 16fb78109d -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: I045921858d76c189931c22511bc0db2763bcf234
 2020-07-30 22:24:31 +00:00
TreeHugger Robot
7e508f03df [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f74 -s ours am: f46c693865 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 2b313d61ae is in history

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

Change-Id: I9c8d7a735cc39e19e2de23d37c64d7bf7ea4d6e4
 2020-07-30 22:07:02 +00:00
TreeHugger Robot
0b6db89d78 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 am: 937fc47c7f -s ours am: bb590a3114 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: I7db9cc5c0e76c95703ae0621006fd4fb07e9c40c
 2020-07-30 22:06:42 +00:00
TreeHugger Robot
40bac5592f [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f74 -s ours am: f46c693865 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 2b313d61ae is in history

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

Change-Id: Iae44dcceb2ed56cdcb86ae616dfb219c6dd003b6
 2020-07-30 22:06:40 +00:00
Yu-Han Yang
bbe4ef7b4b [automerger skipped] DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae am: e75846a203 -s ours am: 019b545156 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: I2aa206785b11373100cb3dc85fee4fcf0c87c0e4
 2020-07-30 22:06:38 +00:00
Yu-Han Yang
11781218c2 Remove unused intent in NiNotification am: ef5279d9f5 am: f6a8668ade am: 0158fc6535 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173663

Change-Id: I4dc9f1c4af78122ff13633babd2ba794b890bfe1
 2020-07-30 22:06:36 +00:00
TreeHugger Robot
f74f12f3c8 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 am: 937fc47c7f -s ours am: bb590a3114 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: Ida40e275944f4b895bd8a3a4e2b3356e3faf77fa
 2020-07-30 22:06:27 +00:00
Yu-Han Yang
16fb78109d [automerger skipped] DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae am: e75846a203 -s ours am: 019b545156 -s ours 
am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 50bf07e963 is in history

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

Change-Id: Ib0e0046cd612eb3d7f06f8a588bd2804eca136cb
 2020-07-30 22:06:23 +00:00
Nate Jiang
4069aa7612 [Wifi] Update language to comply with Android’s inclusive language guidance 
This commit only cleans up in android.net.wifi.aware.
(Cherry pick from internal branch)

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

Bug: 161896447
Test: atest android.net.wifi
Merged-In: Ia9a9b84c4587885a1a20327cbdec0b26eba0ba40
Change-Id: I958baea4804f818a02b8cf6f9a596e2ad18318b0
 2020-07-30 14:58:15 -07:00
TreeHugger Robot
f46c693865 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I530856e73af57f7ff5e1c10ddd2e7eb6c22c9089
 2020-07-30 21:45:47 +00:00
Tyler Gunn
03921ada7b Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd am: c5ef3b9cae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I8c7ee830842424162cd9054432f27a01b3695ea8
 2020-07-30 21:45:46 +00:00
TreeHugger Robot
bb590a3114 [automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 am: 937fc47c7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a13ceca65fbc521b96cedb5a48296d9bb03e245
 2020-07-30 21:44:53 +00:00
Yu-Han Yang
019b545156 [automerger skipped] DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae am: e75846a203 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia313a3ee45c2bc20c40f25f0199202744cbd5629
 2020-07-30 21:43:44 +00:00
Yu-Han Yang
0158fc6535 Remove unused intent in NiNotification am: ef5279d9f5 am: f6a8668ade 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173663

Change-Id: I010c970ee01e9397785788b6f64afecd752c6550
 2020-07-30 21:43:27 +00:00
TreeHugger Robot
74cc0e4f74 Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev 2020-07-30 21:35:54 +00:00
Tyler Gunn
c5ef3b9cae Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I2f838a951cec8f6e7af82a0cd08d99d6045f3952
 2020-07-30 21:25:38 +00:00
TreeHugger Robot
937fc47c7f Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180369

Change-Id: I495aa342376cef6c643f6a04cebc2008739143cb
 2020-07-30 21:25:33 +00:00
Yu-Han Yang
e75846a203 DO NOT MERGE: Remove unused intent in NiNotification am: 2b313d61ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12180369

Change-Id: I7f2f10c7078aeaa51e9a8a20a1ed2ba15c6e21d1
 2020-07-30 21:24:56 +00:00
Yu-Han Yang
f6a8668ade Remove unused intent in NiNotification am: ef5279d9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173663

Change-Id: I22a6ed181b8fbfc334a41da01d0f68edfbae1706
 2020-07-30 21:24:47 +00:00
Tyler Gunn
3772a5b3fd Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: Icfe0a3528478b3fa88a8d66b389add76d324e16c
 2020-07-30 21:08:16 +00:00
TreeHugger Robot
d1e5a489f7 Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev 2020-07-30 21:05:59 +00:00
TreeHugger Robot
e6d324638c [automerger skipped] Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2 am: f761a5add1 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I999a0ed185bfaf5ef43d045b19b046e4594b5cc4
 2020-07-30 20:47:31 +00:00
TreeHugger Robot
614cec0073 Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2 am: 6ce5f1dbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099336

Change-Id: Ib61fdc6adad6d4d7531086f653357f5468aafaf8
 2020-07-30 20:45:19 +00:00
Tyler Gunn
a005cb30ed Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 20:42:55 +00:00
TreeHugger Robot
f761a5add1 Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099336

Change-Id: Icc68a75d127b732e1caf634c5801bd2fd177e7d1
 2020-07-30 20:25:52 +00:00
TreeHugger Robot
6ce5f1dbf4 Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099336

Change-Id: Ie38ba3aaa00b4e85058d8832f559825d22494e0e
 2020-07-30 20:25:41 +00:00
TreeHugger Robot
455470d3b2 Merge "Add missing isShellUser check" into rvc-dev 2020-07-30 20:11:47 +00:00
Winson Chung
a8a07f1f40 Only apply back gesture device config if there are existing insets 
Bug: 161995292
Test: Change navigation modes and verify the insets are correct
Change-Id: I4d940099b7fdc00c129f60dc6b3d0cb470b7f42e
 2020-07-30 17:35:17 +00:00
Treehugger Robot
bd8aa1fe3e Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 am: 9d67d59530 am: 724c877357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378607

Change-Id: Ieddf97ca3fd77c593ad583433316728d3124f5a8
 2020-07-30 17:30:32 +00:00
Treehugger Robot
724c877357 Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 am: 9d67d59530 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378607

Change-Id: Ifb4996d7ccbb7e47da1bb1b8246fb5da94626d4c
 2020-07-30 17:12:24 +00:00
Treehugger Robot
9d67d59530 Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378607

Change-Id: I5d039a7cc5ebb27a2181b7c9871558ca5de39643
 2020-07-30 16:53:47 +00:00
Amruth Ramachandran
22d5710f02 Update toString in ImsReasonInfo 
Added map of int code to string for log readability

Bug: 162505455
Test: Verified with device test
Change-Id: I7aa3cf31737e2e44aa4d63eac643a5d283d8a06f
 2020-07-30 16:44:02 +00:00
Treehugger Robot
98973ea706 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 16:32:28 +00:00
Alice Kuo
c2c679d6cf 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: Ib87c9ebd45c5ee1b5f7296776e5978c12f7b45fc
 2020-07-30 16:15:09 +00:00
Lucas Dupin
536cef1b06 Merge "Require a more specific intent" into pi-dev 2020-07-30 15:54:46 +00:00
Andrei-Valentin Onea
a10fe74cf4 Merge "Update language to comply with Android's inclusive language guidance" am: 31be55091f am: df5b66050c am: b6f7d962e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374279

Change-Id: I184bb0f92a93f1741a7f8e0bff441415bacbb44c
 2020-07-30 13:03:58 +00:00
Andrei-Valentin Onea
b6f7d962e4 Merge "Update language to comply with Android's inclusive language guidance" am: 31be55091f am: df5b66050c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374279

Change-Id: I9bff1926c2878da6b20f67482683afccb21123f4
 2020-07-30 12:42:53 +00:00
Alexander Mishkovets
2f5ddb2fc6 Merge "Integrate system language filtering functionality" am: 2df94f9b15 am: db00e424d9 am: 654ed1df03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362798

Change-Id: I6c7625b82493d37573d8d73a5be9b9c601251915
 2020-07-30 12:37:22 +00:00
Andrei-Valentin Onea
df5b66050c Merge "Update language to comply with Android's inclusive language guidance" am: 31be55091f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374279

Change-Id: I764a06c4226d3ba225c87c61b5096672871ccba2
 2020-07-30 12:30:24 +00:00
Alexander Mishkovets
654ed1df03 Merge "Integrate system language filtering functionality" am: 2df94f9b15 am: db00e424d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362798

Change-Id: I4684de9e0199b2d750108473366d04f605b6e955
 2020-07-30 12:18:53 +00:00
Andrei-Valentin Onea
31be55091f Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 12:09:00 +00:00
Alexander Mishkovets
db00e424d9 Merge "Integrate system language filtering functionality" am: 2df94f9b15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362798

Change-Id: I98c76c6070490f970eed25a5233e1a3331959575
 2020-07-30 12:02:50 +00:00
Alexander Mishkovets
2df94f9b15 Merge "Integrate system language filtering functionality" 2020-07-30 11:44:00 +00:00
Jackal Guo
2603293071 Correct protectionToString am: 379eb5c25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265005

Change-Id: Ib4da555c392f4b93e1fcd7be0056188881a49a35
 2020-07-30 09:03:30 +00:00