Benedict Wong
4755021eb1
Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007972
Change-Id: I69531948b404deac5ffdeb2687f77a324da28fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:55:42 +00:00
Benedict Wong
bd14581e6b
Merge "Trigger revalidation of VCN, underlying networks"
2022-04-01 22:33:00 +00:00
Treehugger Robot
82e2afb277
Merge "Add context to error message." am: 0754714469
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076
Change-Id: I310956878bc02bbf5c0641b6cdc728212ea17946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:19:55 +00:00
Treehugger Robot
0754714469
Merge "Add context to error message."
2022-04-01 22:14:12 +00:00
Ling Ma
4cd991467f
Merge "setProperty check for byte limit" am: 18b4802337
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004952
Change-Id: Ia43944b29bc5da26590057e67aaa99b3bd4b7819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:14:02 +00:00
Ling Ma
9cf73e369d
Merge changes from topic "truncate operator name" am: ffa0f982b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004810
Change-Id: I53d217c4e57a62fc7a4039af16e7e780af5c87f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:13:59 +00:00
Ling Ma
18b4802337
Merge "setProperty check for byte limit"
2022-04-01 21:43:23 +00:00
Ling Ma
ffa0f982b6
Merge changes from topic "truncate operator name"
...
* changes:
Truncate operator name to fit into SystemProp size
Add truncateStringForUtf8Storage()
2022-04-01 21:43:23 +00:00
Treehugger Robot
0aeb6102ce
Merge "Added command line tool to enable/disable new data stack" am: bdf20659d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051831
Change-Id: Ie064d0ab40340e4b862a12a73aee4b257b1eaf50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:56:31 +00:00
Treehugger Robot
bdf20659d3
Merge "Added command line tool to enable/disable new data stack"
2022-04-01 20:40:00 +00:00
Sarah Chin
235c3b6316
Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052598
Change-Id: Id55ff9221c025a93ce0e0a73753c82d65a646320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:57:39 +00:00
Sarah Chin
e5e9a5c339
Merge "Add PROTOCOL_UNKOWN"
2022-04-01 18:32:50 +00:00
Eric Biggers
b548de7856
Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045979
Change-Id: I4bc898e73ec0a23b60f3cf365302690f63da5c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:26:05 +00:00
Eric Biggers
db9ea17177
Merge "Remove FDE warning from AccessibilityShortcutChooserActivity"
2022-04-01 18:00:45 +00:00
Jack Yu
b6512b4ead
Added command line tool to enable/disable new data stack
...
Provide the temporary command line tool to check whether new
data stack is enabled or not.
Bug: 196597630
Test: adb shell cmd phone get-data-mode
Change-Id: I9f95e7424e6e74af12a0f6780a58fb5732df7300
Merged-In: I9f95e7424e6e74af12a0f6780a58fb5732df7300
2022-04-01 10:55:48 -07:00
Ling Ma
d985d0a3fe
Add PROTOCOL_UNKOWN
...
Test: build
Bug: 217375910
Merged-In: I5bd0351925d27bb2178d4cd0cc93197f463236cd
Change-Id: I5bd0351925d27bb2178d4cd0cc93197f463236cd
2022-04-01 09:40:49 -07:00
Bob Badour
93aa95f71a
Add context to error message.
...
Would have been very useful to avoid http://b/227682097
Bug: 227682097
Test: m apexer apexer_test deapexer debugfs_static; atest --host apexer_test
Change-Id: I24234d053a06868493831d40f94f7e46956391a1
2022-04-01 15:21:26 +00:00
mrenouf
c6158cc84d
Merge "Fix edit button in screenshot share activity" am: d7013fb94e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991974
Change-Id: Idd11a3a897401e8a965a211cd46a5e6a731d7f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 12:28:55 +00:00
mrenouf
d7013fb94e
Merge "Fix edit button in screenshot share activity"
2022-04-01 12:10:01 +00:00
Yi-yo Chiang
1e43855f6c
Merge "DSU service: Log insufficient storage space error" am: 9b420e664a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049806
Change-Id: I929141ce4840a879b62664c917904aa541b3f635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:15:47 +00:00
Yi-yo Chiang
9b420e664a
Merge "DSU service: Log insufficient storage space error"
2022-04-01 07:53:59 +00:00
Ling Ma
c901b0b863
Truncate operator name to fit into SystemProp size
...
Test: manual
Bug: 210502588
Change-Id: I59a87fa256a9be54755199034e138a63d89f0885
2022-04-01 02:24:22 +00:00
Ling Ma
58d9786a64
Add truncateStringForUtf8Storage()
...
Test: manual
Bug: 210502588
Change-Id: I5d4ded0cb30151bc567cfedcdb1bbbdb9abdca9b
2022-03-31 18:57:05 -07:00
Jared Duke
e9c7689391
Merge "Fix static lib collision between system_server + framework" am: a6f4bbd418
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050305
Change-Id: I00e1ae911b097b894083f9ba55a9ad3c45fb797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 23:06:02 +00:00
Jared Duke
a6f4bbd418
Merge "Fix static lib collision between system_server + framework"
2022-03-31 22:47:33 +00:00
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
Yi-Yo Chiang
c88a3d9be4
DSU service: Log insufficient storage space error
...
Log a specialized error message if installation task
failed due to insufficient storage space.
This helps the user to disgnose the source of error.
Bug: 200002443
Test: start DSU task and check logcat
Change-Id: Iabb3e0325ae99c343978ca6c35ab8378f20e0527
2022-03-31 18:38:00 +08: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
Jared Duke
b1e859d9c0
Fix static lib collision between system_server + framework
...
Exclude the static library `android.hardware.contexthub-V1.0-java` from
system_server, as it's already included in the framework. This avoids a
collision between SYSTEMSERVERCLASSPATH and BOOTCLASSPATH.
Bug: 215530220
Bug: 222468116
Change-Id: I7b23bfaba58676702b78e74e95911e03e88eb456
Test: m + atest StrictJavaPackagesTest
2022-03-30 22:26:43 +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