Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
531,167 Commits 3 Branches 0 Tags
9d93c316ebadbec2a319336769d30e034c5f6bed
Commit Graph

531167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9d93c316eb Merge "Remove useless code" am: 646cf23c3c am: 53a2ffe768 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: Ic92c5094ec5e593f8a8400d4001d1eb8e54e85e2
 2020-11-06 11:57:55 +00:00
vichang
aa95c6d0b9 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: If52898da0b66bf70ed7533bc991251a1f927f19c
 2020-11-06 11:57:38 +00:00
Treehugger Robot
53a2ffe768 Merge "Remove useless code" am: 646cf23c3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: Id5c6ab919f223fd4da2838c477d7f5665066917c
 2020-11-06 11:34:17 +00:00
vichang
6cb4bb76d6 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: I4e4b657a908907780c7530e30b05531e1ffe1017
 2020-11-06 11:24:03 +00:00
Treehugger Robot
646cf23c3c Merge "Remove useless code" 2020-11-06 11:02:23 +00:00
vichang
ffcc7427a8 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" 2020-11-06 10:51:53 +00:00
Chalard Jean
c74389c5fc Remove useless code 
The semantics of this block are such that restart will
only be false if all components of mArguments are null.
mArguments is a final array initialized in the
constructor of LegacyVpnRunner. The components of the
array are never overwritten (though the components of
those components are), and at least one of these
components will always be non-null (unless somebody
calls startLegacyVpnPrivileged with a non-existing
type, but that never happens).

For safety, this patch also adds a check so that
the code will crash early with a clear message if this
ever happens.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I1f13aa08c6f1870c9610185b603af76f97c22bab
 2020-11-06 15:56:27 +09:00
Remi NGUYEN VAN
d60841c6e4 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I884a464727b8f2dbf7554926dd8a0fd9cab71176
 2020-11-06 05:48:38 +00:00
Daniel Bright
1cf14ba648 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I0da779a79638a3c591fa49ec7538f4900dae9898
 2020-11-06 05:48:04 +00:00
James Mattis
c2ed1f7e81 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I3d013dc1a3caf9c41fbc835f2eb92df4e40bed33
 2020-11-06 05:47:26 +00:00
Remi NGUYEN VAN
2442a58473 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I8c03acd5af53d8dccd183d791a1acaf434d81169
 2020-11-06 05:30:32 +00:00
Daniel Bright
98a2cb4729 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: Ica2a83344b5888ab9a423515005bd6c5ba7e5284
 2020-11-06 05:24:04 +00:00
James Mattis
2feb4fb0a0 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
 2020-11-06 05:19:47 +00:00
Remi NGUYEN VAN
64512597fd Merge "Move VPN JNI to the bottom of srcs" 2020-11-06 05:04:53 +00:00
Daniel Bright
bc99f76305 Merge "Allows APN to be unthrottled through an indication" 2020-11-06 05:04:14 +00:00
James Mattis
f2c37de2ba Merge "Adding multilayered requests to NetworkRequestInfo" 2020-11-06 04:33:24 +00:00
Treehugger Robot
df8410e677 Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015

Change-Id: Ie78c9ad9ed65eefa8a4c8f6146eccf9847709659
 2020-11-06 02:13:16 +00:00
TreeHugger Robot
d8a42e0df4 Merge "Hide overlays over uninstall confirm dialog" into rvc-dev am: d3da899a52 am: b3f0178c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950973

Change-Id: I694d9061131ba6f84b03ddc75d0d401b32aec54d
 2020-11-06 01:18:51 +00:00
TreeHugger Robot
ab3ea1121f [automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d6863 -s ours am: 4a8b72ffc9 -s ours am: d7600974bc -s ours 
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 efa3c1fcca is in history

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

Change-Id: I49c1f7c056ce4ec719be1df38243cf9cbc559c8d
 2020-11-06 01:18:33 +00:00
Treehugger Robot
f2abffe107 Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015

Change-Id: I7e3750c38b1796fb7ba20bdd544fb9831e5eb874
 2020-11-06 01:18:29 +00:00
TreeHugger Robot
b3f0178c0e Merge "Hide overlays over uninstall confirm dialog" into rvc-dev am: d3da899a52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950973

Change-Id: I81708da332da74d49d462de11a206dc76edbd3c7
 2020-11-06 01:05:46 +00:00
TreeHugger Robot
d7600974bc [automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d6863 -s ours am: 4a8b72ffc9 -s ours 
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 efa3c1fcca is in history

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

Change-Id: I2dfa454f6194a55eeb2b6c398703c0dc9fae2441
 2020-11-06 01:05:25 +00:00
Treehugger Robot
1f65c6b62e Merge changes Ib3c9affb,I1dbe3d02,I88681f21 
* changes:
  Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
  Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
  Keystore SPI: Add SecurityLevelEnum to KeyProperties
 2020-11-06 01:01:00 +00:00
TreeHugger Robot
d3da899a52 Merge "Hide overlays over uninstall confirm dialog" into rvc-dev 2020-11-06 00:58:01 +00:00
TreeHugger Robot
4a8b72ffc9 [automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d6863 -s ours 
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 efa3c1fcca is in history

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

Change-Id: I19d8d8da0886bbb6b9e684eeb7fc9e193fb9db02
 2020-11-06 00:51:22 +00:00
TreeHugger Robot
ffd39d6863 Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev 2020-11-06 00:22:43 +00:00
Philip P. Moltmann
719a679de9 Merge changes from topic "12933477" into rvc-dev am: 6a6a15d595 am: 5fe0e5eda3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986657

Change-Id: Ie05102661a2bcc3b5c00c6854373cab46589132f
 2020-11-05 23:59:07 +00:00
Nate Myren
3668965749 Ensure permissions are revoked on state changes am: 84c1247a7e am: 9259e1b2be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933477

Change-Id: Ie675e217a276c0b8baaded52c995180d5f94c867
 2020-11-05 23:59:00 +00:00
Philip P. Moltmann
5fe0e5eda3 Merge changes from topic "12933477" into rvc-dev am: 6a6a15d595 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986657

Change-Id: I56efae68cce32e25bdab66d176759ea9c01b9f27
 2020-11-05 23:39:31 +00:00
Nate Myren
9259e1b2be Ensure permissions are revoked on state changes am: 84c1247a7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933477

Change-Id: I3ab96367fc465f12d60d4bcd2b19f6052638896c
 2020-11-05 23:39:28 +00:00
Philip P. Moltmann
6a6a15d595 Merge changes from topic "12933477" into rvc-dev 
* changes:
  Revoke permission on non-runtime -> runtime upgrade
  Ensure permissions are revoked on state changes
 2020-11-05 23:21:59 +00:00
Eugene Susla
4da258b39d [automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea am: 518a3cfaab -s ours am: a7bc88f935 am: 5ca3e9d694 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950101

Change-Id: I93a06cadf454318e88594441cca8388803352748
 2020-11-05 23:03:59 +00:00
TreeHugger Robot
e712121b1a Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad8138422 am: de29b83c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12840275

Change-Id: I4f145de69a6e8ea5fe038386017db1f1bb2a63a4
 2020-11-05 23:03:50 +00:00
Eugene Susla
5ca3e9d694 [automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea am: 518a3cfaab -s ours am: a7bc88f935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950101

Change-Id: I4147a5bb86e19bd65e4c8ba65645132af4e05d81
 2020-11-05 22:40:29 +00:00
TreeHugger Robot
de29b83c7c Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad8138422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12840275

Change-Id: Icad9b9de18545175b58cef76cfb7893bce7c3717
 2020-11-05 22:40:21 +00:00
Eugene Susla
a7bc88f935 [automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea am: 518a3cfaab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4822b3140c79020d42da87491806907321162c15
 2020-11-05 22:34:47 +00:00
TreeHugger Robot
6ad8138422 Merge "remove sensitive pii from safetynet logging" into rvc-dev 2020-11-05 22:28:40 +00:00
Sudheer Shanka
c003c6bac8 Merge "Fix NetworkPolicyManagerService deadlock" am: cce157aaee am: 109471deae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418834

Change-Id: I7947d1528ba1bb8e8b322d40bfe1d6e45b0ed647
 2020-11-05 22:18:55 +00:00
Eugene Susla
518a3cfaab [automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950101

Change-Id: I7ac85c1a6a9dffbbfd0063d0c86a5bd826f15a5b
 2020-11-05 22:18:36 +00:00
Mohammad Samiul Islam
f174cf0f6a [automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d2a -s ours am: f7c3a7b332 -s ours am: 1983d04202 -s ours 
am skip reason: Change-Id I34d7ee3b84bc351d58ebf024a7ed10dd7db1f55b with SHA-1 b793c2174e is in history

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

Change-Id: Ib7eca6ff11d31c4aef54a5abb76fbe497d2c1af9
 2020-11-05 21:59:35 +00:00
Eugene Susla
24f39eadc1 [automerger skipped] RESTRICT AUTOMERGE am: feb4dd913c -s ours am: ef72a9b8c4 am: 7a85d4deb2 -s ours am: be115041b2 am: f39c63953b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950003

Change-Id: If438abad072216390edad93f448c22678bdd26f5
 2020-11-05 21:59:14 +00:00
TreeHugger Robot
ded5a3df6e [automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev am: e0d7430c0e am: d2dcc48553 -s ours am: 8ce1ac7f93 am: e7a38c81fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939926

Change-Id: I952a6e0e7bb1c1403110e4e761692173a3dec9aa
 2020-11-05 21:59:04 +00:00
Eugene Susla
11c4f67eea [automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddbe8c82b52d3064409a5e953a5b30e7b0290acf
 2020-11-05 21:59:00 +00:00
Eugene Susla
e65edcf8dc [automerger skipped] RESTRICT AUTOMERGE am: 9ec3bf497e am: ee729e7a92 -s ours am: a552fc21c7 am: 811352be16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939926

Change-Id: Ibb1cae84a20becd91b088eeab52b3f1bae1c1f99
 2020-11-05 21:58:57 +00:00
James Mattis
716cef8b90 Adding multilayered requests to NetworkRequestInfo 
Updating NetworkRequestInfo for "multilayered requests" functionality so that
requests can support a network hierarchy. I.e., requests network
with capability A first and if not available, request network with
capability B. This CL is the first step in adding that support by
updating the request object from a single request to a collection.

Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I64a124802986e4cf4aa7de158c6690fdf9851cb2
 2020-11-05 13:55:50 -08:00
Sudheer Shanka
109471deae Merge "Fix NetworkPolicyManagerService deadlock" am: cce157aaee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418834

Change-Id: I405abd8d9d80916c1f19eebfc791e0402c5ba40f
 2020-11-05 21:48:40 +00:00
Mohammad Samiul Islam
1983d04202 [automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d2a -s ours am: f7c3a7b332 -s ours 
am skip reason: Change-Id I34d7ee3b84bc351d58ebf024a7ed10dd7db1f55b with SHA-1 b793c2174e is in history

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

Change-Id: I94bd35e230fdb6fae70db3ddc64a27711b948559
 2020-11-05 21:45:03 +00:00
Eugene Susla
f39c63953b [automerger skipped] RESTRICT AUTOMERGE am: feb4dd913c -s ours am: ef72a9b8c4 am: 7a85d4deb2 -s ours am: be115041b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950003

Change-Id: I8bc5cbbfa883857c608a9f8fde4a6c28b511b90e
 2020-11-05 21:44:52 +00:00
Mohammad Samiul Islam
f7c3a7b332 [automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d2a -s ours 
am skip reason: Change-Id I34d7ee3b84bc351d58ebf024a7ed10dd7db1f55b with SHA-1 b793c2174e is in history

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

Change-Id: Ib8be84cadc90e1d2dc4940be51d43a131e7d7477
 2020-11-05 21:44:40 +00:00
TreeHugger Robot
e7a38c81fd [automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev am: e0d7430c0e am: d2dcc48553 -s ours am: 8ce1ac7f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939926

Change-Id: I7fb0f08d80e09d0da2ffb54d037c784c0b11c2d7
 2020-11-05 21:44:37 +00:00