Eric Biggers
f11ba55d9b
Merge "EntropyMixer: ensure new seed file is as good as old one" am: bcbd6fe8cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050961
Change-Id: I727fa54020dac846ac2343aefdce4f7017cb8dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 22:14:41 +00:00
Eric Biggers
bcbd6fe8cd
Merge "EntropyMixer: ensure new seed file is as good as old one"
2022-03-31 21:56:11 +00:00
Jernej Virag
04c7193fb1
Merge "Add code OWNERS to test OWNERS for internal widgets" am: c207bdcf5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051242
Change-Id: Id95ed0b6de2aed859ab1069343bf0499353da26d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 19:29:03 +00:00
Jernej Virag
c207bdcf5f
Merge "Add code OWNERS to test OWNERS for internal widgets"
2022-03-31 19:11:07 +00:00
Treehugger Robot
ab9e828a43
Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi" am: 6ff14106fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040764
Change-Id: I4cf03283a253a93f793c6ccad088272972d5e048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 19:00:00 +00:00
Treehugger Robot
6ff14106fc
Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi"
2022-03-31 18:39:09 +00:00
Lucas Lin
a093773ca5
Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049444
Change-Id: Ibc1311f6db11c72eef82633661edab8e6dfee2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 15:51:51 +00:00
Lucas Lin
1d5282f4dd
Merge "Clear mInterface before calling resetIkeState()"
2022-03-31 15:35:53 +00:00
Neil Fuller
40bb89325f
Merge "Add Shell permission to support manual testing" am: a2b92f89ec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2047905
Change-Id: I441cec38fb750e2d9492860873ee9f5b331c4747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 15:24:40 +00:00
Jernej Virag
ba5392ca14
Add code OWNERS to test OWNERS for internal widgets
...
This should prevent long review times because test ownership doesn't match code ownership.
Test: n/a
Change-Id: I59812d77db671ee39906df009a918f2881259eab
2022-03-31 15:10:53 +00:00
Neil Fuller
a2b92f89ec
Merge "Add Shell permission to support manual testing"
2022-03-31 15:01:35 +00:00
Treehugger Robot
e34c026cbb
Merge "Update OWNERS file to reflect ownership in capability related files" am: c32215ee94
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030804
Change-Id: I61888a847d8c75f1e9d87f42a1ba7029026454ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 04:42:10 +00:00
Eric Biggers
88a2a7e5c9
EntropyMixer: ensure new seed file is as good as old one
...
Generate the new seed by hashing the old seed together with some bytes
from /dev/urandom, rather than just using the bytes from /dev/urandom
alone. This ensures that the new seed doesn't contain less entropy than
the old one, and follows the latest recommended best practices.
While doing this, also clean up various other things:
- Start using AtomicFile to update the seed file so that it won't be
corrupted if the system crashes while it is being updated.
- Eliminate the RandomBlock class, as it isn't very useful.
- Send all the device-specific information to /dev/urandom in one write.
- Improve comments, variable names, and method names.
- Improve log messages, e.g. don't log a warning on every first boot.
- Improve the unit test.
- Use @VisibleForTesting rather than an ad-hoc comment.
Bug: 226608458
Test: atest EntropyMixerTest
Test: checked for expected log messages
Change-Id: Ief9485536cff50c07d4d920fa32e21dbde6dd245
2022-03-31 04:21:55 +00:00
Treehugger Robot
c32215ee94
Merge "Update OWNERS file to reflect ownership in capability related files"
2022-03-31 04:17:58 +00:00
Ken Chen
aa82affbc0
Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731cd3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049804
Change-Id: Ic958c83026e64072ece9361227bbd0bcfe79f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:46:57 +00:00
Ken Chen
ef89731cd3
Merge "Update data type and comments on tagSocket/untagSocket APIs"
2022-03-31 03:29:02 +00:00
Treehugger Robot
f594c2260d
Merge "Update owners for app-widget test" am: 99d2f232f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050354
Change-Id: Ie818561bf4c2dc36c76ef88a72a513dc877c6a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:24:38 +00:00
Treehugger Robot
99d2f232f8
Merge "Update owners for app-widget test"
2022-03-31 03:03:44 +00:00
Pinyao Ting
6fb3b9e475
Update owners for app-widget test
...
Change-Id: I95eb54d4eb35b35628105ce0227e0c163d0a3466
2022-03-31 00:39:50 +00:00
Treehugger Robot
8ca2b1f53d
Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725
Change-Id: I762ee23d69ec3aef16f049a560c59e61d73f7bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:55:40 +00:00
Treehugger Robot
cf13ba50cd
Merge "Update owners of framework-jarjar-rules.txt"
2022-03-30 19:26:45 +00:00
Treehugger Robot
40555ca1fa
Merge "Update handover rule java doc" am: a535dfe28a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050104
Change-Id: I84ac37a0b88bdd823e94c8787ca4c6459134ef1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:10:42 +00:00
Treehugger Robot
a535dfe28a
Merge "Update handover rule java doc"
2022-03-30 18:35:23 +00:00
Treehugger Robot
83b26d260d
Merge "Added Java bindings to async trace functions with track argument" am: 004bb42f93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2048185
Change-Id: Iafff9cf2087a413cf8d625269a4bd5e57e18dce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:31:00 +00:00
Tim Murray
a8888da2a2
Merge "Update OWNERS for tracing, including the Java APIs." am: 45f3622eb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049990
Change-Id: I4eafec43cbe029ae4467071a4e6c09b979acec75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:30:36 +00:00
Tim Murray
f1f3525430
Merge "update OWNERS for trace APIs" am: 1eb344eda8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2048186
Change-Id: I280c8e010cf709c532e483b86c714d8d0b6f2418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:29:51 +00:00
Treehugger Robot
004bb42f93
Merge "Added Java bindings to async trace functions with track argument"
2022-03-30 18:16:29 +00:00
Tim Murray
45f3622eb3
Merge "Update OWNERS for tracing, including the Java APIs."
2022-03-30 18:15:38 +00:00
Tim Murray
1c968c099f
Update OWNERS for tracing, including the Java APIs.
...
Change-Id: I7b4f972f09695c68110ed09e3a75e35e40a61387
2022-03-30 11:10:21 -07:00
Tim Murray
1eb344eda8
Merge "update OWNERS for trace APIs"
2022-03-30 18:03:35 +00:00
Ling Ma
da11a0da69
Update handover rule java doc
...
Change-Id: I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc
Merged-In: I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc
Test: atest
Bug: 222018690
2022-03-30 10:17:55 -07:00
Ken Chen
9c315eb11f
Update data type and comments on tagSocket/untagSocket APIs
...
- Fix comment in version script to say LL-NDK, not NDK
- Use uint32_t for tag
Bug: 223423155
Test: CtsNetTestCases:android.net.TrafficStatsTest
Test: CtsNativeNetPlatformTestCases
Change-Id: Ifb819ed0adeb8f173b98c3f131a4bf2e0715dd4e
2022-03-31 00:28:15 +08:00
Pedro Loureiro
b4f03e15eb
Update owners of framework-jarjar-rules.txt
...
Soong team is now owner too.
Test: N/A
Change-Id: I9af77c6f3e9e63032da278abe3b020bba16c51ab
2022-03-30 16:03:42 +00:00
Treehugger Robot
895fe3cba3
Merge "ApiDocs.bp: fix typo (proofrerad -> proofread)" am: 8513c50145
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049723
Change-Id: Ic8cace97a78cdd43494842a2ad966bfb925b781e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:12:57 +00:00
Treehugger Robot
8513c50145
Merge "ApiDocs.bp: fix typo (proofrerad -> proofread)"
2022-03-30 14:59:06 +00:00
Seth Moore
dc13e716c4
Merge "Inform the remote provisioner when a key may have been consumed" am: ca344c9949
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043513
Change-Id: Ic7e0e13227489df4c080a17d002127e8f3c612c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 14:33:56 +00:00
Seth Moore
ca344c9949
Merge "Inform the remote provisioner when a key may have been consumed"
2022-03-30 14:12:05 +00:00
lucaslin
520cc2fde3
Clear mInterface before calling resetIkeState()
...
Clear mInterface before calling resetIkeState() in
onDefaultNetworkChanged().
resetIkeState() will trigger interfaceRemoved() to be called.
If mInterface is set, interfaceRemoved() will clear
Ikev2VpnRunner which makes VPN disconnect.
This issue can be reproduced when device establishes VPN
connection with mobile data first then connects to wifi.
In this case, onLost() for mobile data will not be called
because there is a new network(wifi) can satisfy the request,
so only onAvailable() for wifi will be called.
Which means onSessionLost() will not be called and only
onDefaultNetworkChanged() will be called, which makes that
mInterface is not cleared before interfaceRemoved() is called.
Bug: 219546241
Test: Check if VPN is still there when establishing VPN with
mobile data first, then connect to wifi and disconnect
wifi.
Change-Id: I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc
2022-03-30 14:03:01 +00:00
Neil Fuller
fddc4e2741
Add Shell permission to support manual testing
...
Add android.permission.SUGGEST_TELEPHONY_TIME_AND_ZONE to the shell
process to enable command-line injection of time zone suggestions to the
time_zone_detector service.
Shell already has permissions like SET_TIME_ZONE that allow the time
zone to be set directly, so this is not a security regression.
Bug: 227337462
Test: adb shell cmd time_zone_detector suggest_telephony_time_zone --slot_index 0 --zone_id Europe/London --quality single --match_type country
Merged-In: I377cab85a1b39ef2887b452d1ffcdc5b00a8d5ab
Change-Id: I377cab85a1b39ef2887b452d1ffcdc5b00a8d5ab
2022-03-30 13:28:57 +00:00
Santos Cordon
d2809a4f39
Merge "Add entry to OWNERS" am: e5e6e495aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028603
Change-Id: I72ebb3987d294df1a53acd6c993a99fd1c0efe9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 12:57:59 +00:00
Santos Cordon
e5e6e495aa
Merge "Add entry to OWNERS"
2022-03-30 12:32:45 +00:00
Mårten Kongstad
2598fe0136
ApiDocs.bp: fix typo (proofrerad -> proofread)
...
Bug: N/A
Test: builds
Change-Id: Idced669300ad40afd0de78046c2d4479d8ef75de
2022-03-30 12:31:33 +00:00
Yi-yo Chiang
1991fbc73b
Merge "DSU service: Pipeline the installation task to improve performance" am: 309fad06f6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045078
Change-Id: Ia7622eb69de48d2ffccb189de6cf29d636057b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 03:00:48 +00:00
Yi-yo Chiang
309fad06f6
Merge "DSU service: Pipeline the installation task to improve performance"
2022-03-30 02:45:44 +00:00
Sarah Chin
50f6b2138a
Merge "Add support for RAT-based TCP buffer sizes" am: 301fddda9d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2048184
Change-Id: Id59b4bd63fac7f55f3a53fc449c3eb431a1b0682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 23:44:32 +00:00
Sarah Chin
301fddda9d
Merge "Add support for RAT-based TCP buffer sizes"
2022-03-29 23:25:57 +00:00
Etienne Ruffieux
9fd8b3411c
Merge changes from topic "api-review-result-receiver" am: b7de235729
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038904
Change-Id: Idddcd7bcbb10e30e477b6fd8e23ea33b2019353a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:53:05 +00:00
Etienne Ruffieux
2d0b69cd5e
[API Review] Replace ResultReceiver by Executor am: 8d4a9f8d72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019937
Change-Id: I0ce280130dd45461a6c2012a030316bd2f2bb095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:53:00 +00:00
Etienne Ruffieux
b7de235729
Merge changes from topic "api-review-result-receiver"
...
* changes:
Added error method to interface Bluetooth stats
[API Review] Replace ResultReceiver by Executor
2022-03-29 20:36:29 +00:00
Tim Murray
b76f87acdd
update OWNERS for trace APIs
...
Change-Id: I7a26e732e005fe933808b8f1da9ad6dafaba0f62
2022-03-29 13:07:26 -07:00