Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,239 Commits 3 Branches 0 Tags
e35d11225a528351970fe093efdfaaafbf8a10bc
Commit Graph

691239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e35d11225a Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 am: 8c10a6aa0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I100fd497b19a8cad113c7d9320c1e64212502896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 15:25:20 +00:00
TreeHugger Robot
8c10a6aa0d Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I892a79e6b627eb1e8e58007613a5855b7e74250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 15:06:37 +00:00
TreeHugger Robot
5b62c51502 Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: Ib7bf62ea0ad68e3a104d426f7f1d912597cc471e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 14:46:51 +00:00
TreeHugger Robot
be7735efcb Merge "Prevent exfiltration of system files via user image settings." into sc-dev 2022-04-01 14:29:48 +00:00
mrenouf
e50de70f41 Merge "Fix edit button in screenshot share activity" am: d7013fb94e am: c6158cc84d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991974

Change-Id: I2e4e50e79a97eaea2871cc6a743417c4b4aab588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 12:50:50 +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
8c48dc11cf Merge "DSU service: Log insufficient storage space error" am: 9b420e664a am: 1e43855f6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049806

Change-Id: I7b12a1c5d2dfb833c5330c44a35b110fc18c1859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:29:33 +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
Jared Duke
8496003245 Merge "Fix static lib collision between system_server + framework" am: a6f4bbd418 am: e9c7689391 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050305

Change-Id: Ib370572baa0f44a0236a8de0157573a9ea700d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 23:22:12 +00: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
e0bb053ef0 Merge "EntropyMixer: ensure new seed file is as good as old one" am: bcbd6fe8cd am: f11ba55d9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050961

Change-Id: Ib2ebef7cce61178ff84c74c50cc5e9bdcf1391f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 22:29:57 +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
789701fb45 Merge "Add code OWNERS to test OWNERS for internal widgets" am: c207bdcf5f am: 04c7193fb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051242

Change-Id: Id7458a889e8b084a260b18f56db315ee1317b3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 19:59:30 +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
Treehugger Robot
f8adc1692b Merge "[DeviceConfig] cherry-pick deleteProperty SystemApi" am: 6ff14106fc am: ab9e828a43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040764

Change-Id: Id0b7cb4f43df62a2a900fc0eab016aeb1a08c89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 19:22:46 +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
c5bdf9b7a4 Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4dd am: a093773ca5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049444

Change-Id: Ie2fb4a49195574ac91609d269fc72585674e33d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 16:17:54 +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
Neil Fuller
aff1739e5d Merge "Add Shell permission to support manual testing" am: a2b92f89ec am: 40bb89325f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2047905

Change-Id: Id865b55300c2128d42a8296fc6d6cd0a812d17dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 15:45:31 +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
edbb1a9687 Merge "Update OWNERS file to reflect ownership in capability related files" am: c32215ee94 am: e34c026cbb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030804

Change-Id: Ibf50e24133b3c74cb61f59c665262703a5ad6727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 04:58:11 +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
292d5f01ec Merge "Update data type and comments on tagSocket/untagSocket APIs" am: ef89731cd3 am: aa82affbc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049804

Change-Id: I44cf6b9d99222a26643b319710b06f5f33df8ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 03:48:21 +00:00
Treehugger Robot
5f207e3faf Merge "Update owners for app-widget test" am: 99d2f232f8 am: f594c2260d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050354

Change-Id: I6e8ec13418c4d3fb5bb5b11617733d6b95b9c03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 03:48:07 +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
f542c6c0b0 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours am: b9573bc095 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ac380cf8513e036bd3f8875413223531c93ee89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:13:58 +00:00
Oli Lan
68222b7aed [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours am: 03b2b4d180 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib129610248e21efc69a5a5cdf91ef1394dae084a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:13:39 +00:00
TreeHugger Robot
b9573bc095 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c745490d1c259c67244b740fc5941d08bf2faca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:52:36 +00:00
Oli Lan
03b2b4d180 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c2ddb167b04561a822608aa3adc4458f7b546a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:52:29 +00:00
TreeHugger Robot
2f5a38fcab [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I308b372b6946e7368535bbd5fb43a3988f5e24fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:36:54 +00:00
Oli Lan
90f9e26f77 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48ef33ccadeaa8156f3995af9ec044a0f3d28af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:36:43 +00:00
Treehugger Robot
7c67f2f583 Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd am: 8ca2b1f53d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725

Change-Id: I623886bb6c1504550851cf03cf7278c5a4e0ab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:20:56 +00:00
TreeHugger Robot
ce83bd7860 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dfc5c3ca4833559ce1e69dacec1cca1dcf88f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 20:18:59 +00:00