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
TreeHugger Robot
9d81730088 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev am: 00ec7767a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522926

Change-Id: I8e3f0fde0a0a2bbe9027ea00541c41cccbb512ed
 2020-09-10 00:20:18 +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
b6380403ea Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I23fca26a229780f79493cd03ad249fe311ae4035
 2020-09-10 00:20:11 +00:00
Julia Reynolds
2d983eccad [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47cb1fad436cfca87677ee5510f69b6211559d3e
 2020-09-10 00:19:55 +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
Etan Cohen
7f60f432fb [WIFI] Make Aware + Connectivity agent network specifiers sensitive 
Configure the Wi-Fi Aware agent network
specifier as sensitive. This will strip it out from the
network capabilities before the capabilities are forwarded to the
app.

Necessary since the agent network specifier contains information
which the apps should not have.

Bug: 161853197
Bug: 161370134
Test: atest ConnectivityServiceTest (frameworks/base/tests/net)
Test: atest frameworks/base/tests/net
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks/opt/net/ethernet/tests
Test: atest android.net.cts - some flakiness!
Test: act.py ThroughputTest
Test: act.py DataPathTest
Test: atest SingleDeviceTest (cts)
Change-Id: Ia6adf2afa0f2052dc46a504ceb3e5aaba591aab8
Merged-In: I9673107a2ee13bca63539fc7dbee7f376af3ebcb
 2020-09-10 00:18:36 +00:00
TreeHugger Robot
9c70259e2b Merge "[CS] Add an option to block sensitive network specifier" into pi-dev 2020-09-10 00:16:15 +00:00
TreeHugger Robot
7e4fa5e87d Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: I4b08f76c920929010808063679b081e10a37c798
 2020-09-10 00:04:50 +00:00
Julia Reynolds
8084de65e4 [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: I701d42ffdfe32e318c5364cf7e37b41f4f90e56d
 2020-09-10 00:04:43 +00:00
TreeHugger Robot
00ec7767a9 Merge "Accept repeated locale as an input of LocaleList construction." into oc-dev 2020-09-10 00:02:01 +00:00
TreeHugger Robot
c335a819fe Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec am: 537a509d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: I41cc1373518c1d7d97731abd82cde81190937c79
 2020-09-09 23:58:01 +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
06adb3f55c Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512485

Change-Id: Ie8e9b9a1273f5fd48a038f16749a7ecdd85078cf
 2020-09-09 23:57:36 +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
f6d7b592ff [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7c25516282b170b78ab7d0c8d984b86a19199f5
 2020-09-09 23:57:20 +00:00
TreeHugger Robot
537a509d99 Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev am: 941e8bb7ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12523479

Change-Id: If859dfe52b3e20d50630559161f1448feec48f3a
 2020-09-09 23:57:00 +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
941e8bb7ec Merge "Accept repeated locale as an input of LocaleList construction." into qt-dev 2020-09-09 23:43:58 +00:00
TreeHugger Robot
c0ec138c47 Merge "Sanitize more of the notification text fields" into pi-dev 2020-09-09 23:42:57 +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
55f9c81eba [automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2fcdd11642653d4ad3c39f0dea0e2e82cd5a899
 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
Julia Reynolds
5b662fd7c1 DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: I63fec9ad25d189e68aee9e3b5b43ebd53cf7aab7
 2020-09-09 22:59:20 +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
2d7d8c2604 DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: I4c847573b6ce8032084eeeee4835bd38be9c6c79
 2020-09-09 22:32:12 +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
Bradley Allen
cefc89c911 docs: Added links to the Android 11 summary pages on developer.android.com. 
Test: http://go/forrest-run/L06800000688439076
Bug: 163618180
Change-Id: Ibe136020df4ef60183f3726fc0f6336b58c37f99
 2020-09-09 17:41:07 +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