Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
518,909 Commits 3 Branches 0 Tags
8a1bf4c696f3e49bb2cd4bdedce2b9c706185285
Commit Graph

518909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8a1bf4c696 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a am: fda237ae5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I415d67bda9bc2fa48739e45d5b1f530fd0c30956
 2020-09-10 00:39:11 +00:00
Julia Reynolds
fd5ca7926f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 am: 0fac23f66e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ic0c60d60be1359979df0eb2d13450e7aefe0ccdb
 2020-09-10 00:38:50 +00:00
TreeHugger Robot
7a8fe1d4ca Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d am: 7012fe4440 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: I73f0d94af00a4b4620ae81011f8d885ab4338082
 2020-09-10 00:38:40 +00:00
TreeHugger Robot
bf508c1c59 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a am: 9e08b1cad3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I91d069f9c2b6e6c26511903a8c8a205014ad0d95
 2020-09-10 00:38:23 +00:00
Automerger Merge Worker
6844992410 Merge "Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 6367b4800e" into rvc-d1-dev-plus-aosp 2020-09-10 00:38:16 +00:00
Julia Reynolds
575a789759 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 am: e383c8697f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: I1e1ff16b5e8f2b051bcba59c0a5971d3433b3eee
 2020-09-10 00:38:10 +00:00
TreeHugger Robot
39f33f6c58 Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 6367b4800e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ie891af706cd6b27f7dfb78f65312bd465bf7e77c
 2020-09-10 00:38:07 +00:00
TreeHugger Robot
089f82deb6 Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 1ed53ed94e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: I07d566dc2943e5001a95a0a7437d699cdd365bdd
 2020-09-10 00:37:58 +00:00
TreeHugger Robot
7012fe4440 Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: I555f07756c6e1188ddbdf41f406c1ded2679a82e
 2020-09-10 00:22:03 +00:00
TreeHugger Robot
9e08b1cad3 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: Id16f6d2a2000adb0d5797b02ed11e0083939373c
 2020-09-10 00:21:34 +00:00
Julia Reynolds
e383c8697f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ie1d66b36bd6b17c2326ad84f069dc5fbcc3fcf8b
 2020-09-10 00:21:05 +00:00
TreeHugger Robot
fda237ae5a Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 am: 6ad9a7886a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I65c96fa4b23ce15f31d7dbed4cafab767c579491
 2020-09-10 00:20:57 +00:00
Julia Reynolds
0fac23f66e [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: I381ca7e10ec0cd4fef05845494ad70bfa9306a23
 2020-09-10 00:20:35 +00:00
TreeHugger Robot
1ed53ed94e Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ief6065688eb49cd0d795dbd892ea9bfa76290f2b
 2020-09-10 00:20:15 +00:00
TreeHugger Robot
6367b4800e Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ie996b9a2f55d0df45691ddb793f8f052cd746bdd
 2020-09-10 00:19:53 +00:00
TreeHugger Robot
c6ee95fd2d Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512484

Change-Id: Ibad2bbbb351c0b2c7e88b1de3a01cd7747faf802
 2020-09-09 23:57:45 +00:00
TreeHugger Robot
6ad9a7886a Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f am: 69eec91731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I0b5be5b109fd8680c1d69c803691d592f6d0b32e
 2020-09-09 23:57:27 +00:00
Julia Reynolds
5529699510 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8d4353eba00391f08299170673942f7befed49
 2020-09-09 23:56:54 +00:00
TreeHugger Robot
ceb7aefd6f Merge "Sanitize more of the notification text fields" into rvc-dev 2020-09-09 23:55:10 +00:00
TreeHugger Robot
3830f1214c Merge "Sanitize more of the notification text fields" into qt-qpr1-dev 2020-09-09 23:41:05 +00:00
TreeHugger Robot
20e2db6d6b Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev am: 5cacc10912 am: 830e2cbbce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513781

Change-Id: I8542563ef6e221b7766c558abd28f5ff5fcc027e
 2020-09-09 23:18:48 +00:00
TreeHugger Robot
f96042120e Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev am: 5cacc10912 am: c6b94720da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513781

Change-Id: I4409623a661600d7a4632920de2dce0b596ce89e
 2020-09-09 23:17:37 +00:00
TreeHugger Robot
69eec91731 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 am: 394fb1c82f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I7d64ad38dbea316166ce577dc8712155cae7d87d
 2020-09-09 23:17:35 +00:00
Julia Reynolds
aa1073f47f [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512683

Change-Id: Ia6c7c59430c8075af11b957723831e58f593acff
 2020-09-09 23:17:21 +00:00
TreeHugger Robot
830e2cbbce Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev am: 5cacc10912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513781

Change-Id: I523bd094a53e01c06450d726ed4ee75e5156b362
 2020-09-09 23:00:33 +00:00
TreeHugger Robot
394fb1c82f Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev am: 7411fd94a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513538

Change-Id: I3a9d2b3758cb3bbb5eecdf284d838f2475bb1d43
 2020-09-09 23:00:32 +00:00
Julia Reynolds
31accf77d8 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If516e824730abcd5523d174045f7f53a6afceb1c
 2020-09-09 23:00:19 +00:00
TreeHugger Robot
c6b94720da Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev am: 5cacc10912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513781

Change-Id: I8991122f4e553f78b5511b3d8753a8944ef7c9c2
 2020-09-09 22:59:48 +00:00
TreeHugger Robot
7411fd94a0 Merge "Accept repeated locale as an input of LocaleList construction." into pi-dev 2020-09-09 22:50:08 +00:00
TreeHugger Robot
5cacc10912 Merge "Accept repeated locale as an input of LocaleList construction." into rvc-dev 2020-09-09 22:38:02 +00:00
Julia Reynolds
db4d949ee2 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a7e611a7eab7666a787f7bc120703704ae5e345
 2020-09-09 22:32:12 +00:00
Seigo Nonaka
5e7ed2485d Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 am: 9555d60871 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I4385b05ef508d341242603135bb6e783a057d8cc
 2020-09-09 21:29:51 +00:00
Seigo Nonaka
f192ef78ae Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 am: c0b541b0ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I1d7f2cf3d005534c841e16d46fdd5096ef5047e0
 2020-09-09 21:29:29 +00:00
Seigo Nonaka
9555d60871 Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I5e6889206dc08d4475695ed619c5b5fc1423e6a0
 2020-09-09 20:57:57 +00:00
Seigo Nonaka
c0b541b0ec Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 am: 8b4cd9aef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: If6140b007349d0c4be79c98acc816c9de3c55e61
 2020-09-09 20:57:20 +00:00
Seigo Nonaka
8b4cd9aef3 Accept repeated locale as an input of LocaleList construction. am: 41b1674f77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12540040

Change-Id: I69509d7ddadb1787f56ce31f0ff2fb617537b2ce
 2020-09-09 20:33:10 +00:00
Tiger Huang
60c4000103 [automerger skipped] Update requested state after applying pending frames am: dfc8abb1ff -s ours am: 8cac1f2038 -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 23c75281ef is in history

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

Change-Id: I01475e45ab4092af456052d9960017c5525e1c54
 2020-09-09 19:55:26 +00:00
Tiger Huang
2da215623d [automerger skipped] Update requested state after applying pending frames am: dfc8abb1ff am: d541d1d4fd -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 23c75281ef is in history

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

Change-Id: I0f9fdf9bd70a1fa0341b6e7e7226791f2c6ab152
 2020-09-09 19:55:15 +00:00
Tiger Huang
d541d1d4fd Update requested state after applying pending frames am: dfc8abb1ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12526908

Change-Id: I40156abe8952ae5b9ed36b3bc6ae5b854380e14e
 2020-09-09 19:30:32 +00:00
Tiger Huang
8cac1f2038 [automerger skipped] Update requested state after applying pending frames am: dfc8abb1ff -s ours 
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 23c75281ef is in history

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

Change-Id: I9488494e621167b6cb4fd4b09b1530cf674e994d
 2020-09-09 19:30:09 +00:00
Jooyung Han
9077548277 [automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e43 -s ours am: bcb603908d -s ours 
am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 39c94c0493 is in history

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

Change-Id: I949e2b83eaff8c056431e9cf21a7567f54e6cc73
 2020-09-09 08:24:36 +00:00
Sergey Nikolaienkov
d851ed5dde Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e am: 4bf2a8e322 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: I2440cd31445f66534844958b5ee50cd8b6b641d1
 2020-09-09 08:24:10 +00:00
Jooyung Han
bcb603908d [automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e43 -s ours 
am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 39c94c0493 is in history

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

Change-Id: Ie2c809af0845894a98152fd1ac2f43430f4dae65
 2020-09-09 07:58:02 +00:00
Sergey Nikolaienkov
4bf2a8e322 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: I3a835c92cf86985d6861382f33c58d5df000f2d7
 2020-09-09 07:57:43 +00:00
Jooyung Han
14a6871e43 Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master 2020-09-09 07:35:37 +00:00
Sergey Nikolaienkov
ec82033d3e Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
 2020-09-09 07:23:52 +00:00
Sergey Nikolaienkov
104d2f92b3 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" 2020-09-09 07:09:11 +00:00
Jooyung Han
fa78ddbdc8 statsd: mark libstats_jni as jni_libs 
This helps the build system to convey the information to linkerconfig so
that jni_libs are available via libnativeloader.

Bug: 168077238
Bug: 150767721
Test: presubmit
Merged-In: Ie32e88355828c8f696cce9d128eebb6da70026f1
Change-Id: Ie32e88355828c8f696cce9d128eebb6da70026f1
(cherry picked from commit 95642bbc3f)
(cherry picked from commit 39c94c0493)
 2020-09-09 06:15:32 +00:00
Seigo Nonaka
41b1674f77 Accept repeated locale as an input of LocaleList construction. 
Repeated locale has not been accepted and IllegalArgumentException
is thrown. Instead of throwing exception, dropping repeated locale
instead.

Bug: 152410253
Test: atest LocaleListTest
Change-Id: I80f243678ac3024eaeb0349f770cff897df7f332
 2020-09-08 20:22:48 +00:00
Brad Ebinger
cc0bbcb8d7 Merge "Update OWNERS" am: 33082d4490 am: f3670cc3d3 am: ee81b81b29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418955

Change-Id: I1ef087238cbe33ef654878abb3b29186f04cdf42
 2020-09-08 20:18:23 +00:00