Commit Graph

1635 Commits

Author SHA1 Message Date
Jeff Sharkey
4b5b0174d0 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 am: 487d394296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647
2020-09-15 21:01:48 +00:00
Jeff Sharkey
6516a83886 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ifce5239991e3b78dd4757712e3b88093ad7161f0
2020-09-14 10:00:02 -06:00
Khaled Abdelmohsen
f2afb166d4 Merge "Parse source stamp lineage in platform" 2020-09-14 10:18:03 +00:00
Khaled Abdelmohsen
5aa65c1967 Parse source stamp lineage in platform
Bug: 167962287
Test: atest FrameworksCoreTests:SourceStampVerifierTest
Change-Id: I9e30dde9cebe97ff7b92f02feb5c82b3a58a97b1
2020-09-11 18:17:07 +01:00
Yi-Ling Chuang
eb87796994 Add a feature flag for settings contextual home.
Bug: 168179764
Test: rebuild
Change-Id: I6e1baa34e1d38ed9c4848cdcea902aaaf52c4192
2020-09-10 17:13:01 +08:00
Yanting Yang
b95a193c1f Add a feature flag for silky home
Bug: 168166015
Test: robotest & rebuild
Change-Id: I16df742156e4bfb18ac0f80bcd14bf1c27a952eb
2020-09-10 12:57:43 +08:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Alex Buynytskyy
ec6f3e189c APK digest API and initial implementation.
Bug: 160605420
Test: atest ChecksumsTest

Change-Id: I08ef0b131c44313f2c6acddad00dfa03598cc1ff
2020-08-24 19:54:02 -07:00
Treehugger Robot
bc32d3e0a0 Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1 am: 37be2eefe9 am: d82657834a am: 9185ac265b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383976

Change-Id: Ia104a8eae3cd39299b7bb61185ded1cc026a4835
2020-07-31 22:09:57 +00:00
Treehugger Robot
37be2eefe9 Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383976

Change-Id: I318defffeb05aeb6d742fe95c5ca84f46604e55e
2020-07-31 21:14:04 +00:00
Alice Kuo
2658f931df Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

  #inclusivefixit

Bug: 162536543
Change-Id: Id328052e95765170520bd35f1872ce4c6457fecb
2020-07-31 18:52:16 +00:00
Zim
a813bc1f05 Remove persist.sys.fuse == false code paths
Since Android R, the FUSE prop is always on and FUSE-off is no longer
supported

Test: m
Bug: 160159282
Change-Id: Ia815c39d898b05bf8082ec5b7dfd903cc9e150bc
2020-07-09 11:54:45 +01:00
Alex Buynytskyy
f4f1218d18 V4 signature check refactors.
- expose all v2/v3 digests to compare against v4: this is more robust
and don't rely on a comment to maintain compatibility,
- renamings and cleanups.

Bug: 160605420
Test: refactoring CL

Change-Id: Ib46855e0e1985fae244bb8aabbb40a7231a3736d
2020-07-08 00:52:11 +00:00
vichang
ff40caf3e2 Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 am: 1c44c3b771 am: 4d9269062b am: 542d231ddd am: 7b4b6813d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: I59697d039272ae4a2c12995812b4dd9094a21007
2020-07-02 11:45:30 +00:00
vichang
4d9269062b Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 am: 1c44c3b771
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: I89413242c6497114e8e533cff43d17b44fd758eb
2020-07-02 10:50:07 +00:00
vichang
26ed852eaf Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e2301 am: 64937407f2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346485

Change-Id: I5ded5092e4c7706f58417a5c97f3207524b44a95
2020-06-30 17:23:46 +00:00
Victor Chang
f61ae810c6 Move libcore.timezone to the i18n module - Final part
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: Id3c9a56dcf86b6f5ec81d09d12e432fc97f178c0
2020-06-30 14:30:46 +01:00
Victor Chang
2ea241f6ee Use new package name for ZoneInfo and libcore.timezone
Bug: 141747409
Test: None
Merged-In: Id99a345ec024179295063c3644f72c062cb50554
Change-Id: Id99a345ec024179295063c3644f72c062cb50554
2020-06-30 13:53:47 +01:00
Victor Chang
6c22f6adb0 Use new package name for ZoneInfo and libcore.timezone
Bug: 141747409
Test: None
Change-Id: Id99a345ec024179295063c3644f72c062cb50554
2020-06-25 18:30:29 +01:00
Khaled Abdelmohsen
1682154105 Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1 am: 75f12a997a am: bab5d2ff0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613

Change-Id: Idd2e42054f293c4bd188bb1d625c253630106435
2020-06-19 19:07:25 +00:00
Khaled Abdelmohsen
bab5d2ff0b Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1 am: 75f12a997a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613

Change-Id: I43a9bbb813f56c2b3f90409dad44f1a913e515f1
2020-06-19 18:43:29 +00:00
Khaled Abdelmohsen
b629527d92 Merge "Modify source stamp format" into rvc-dev am: 592da34c0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613

Change-Id: Ie6ece79118a75ffac46e4d665844717cb6ba9c57
2020-06-19 18:42:36 +00:00
Khaled Abdelmohsen
592da34c0b Merge "Modify source stamp format" into rvc-dev 2020-06-19 18:36:27 +00:00
TreeHugger Robot
c8f40fee57 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: 1471727cdb am: be044b011a am: bb65605a2f am: 980fa106e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907890

Change-Id: Ie993b5a659a0298adc1a5caf2d1a3d6628d38024
2020-06-19 06:44:11 +00:00
TreeHugger Robot
980fa106e5 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: 1471727cdb am: be044b011a am: bb65605a2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907890

Change-Id: Ie2cdc06b030dd582a7e962f57d90e781b8f1ba64
2020-06-19 06:18:41 +00:00
TreeHugger Robot
41505c9616 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: 1471727cdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907890

Change-Id: Iecbd4b65bf2025ee26aa1d550878b176f4abba34
2020-06-19 05:44:59 +00:00
Jason Chiu
7ebdce50cd Remove the feature flag of contextual home V2
Bug: 159393461
Test: rebuild
Change-Id: I0873794e398bca35820a23860a6325a7b6097da4
2020-06-19 11:30:13 +08:00
Khaled Abdelmohsen
549ce7a482 Modify source stamp format
Modify source stamp verifier to account for APK signature schemes V1,
V2, and V3. The verifier would verify the signature schemes found in the
APK.

If the APK is signed using a signature scheme that does not have a
corresponding verified source stamp signed digest, the source stamp is
considered unverified.

Bug: 158196850
Test: atest FrameworksCoreTests:SourceStampVerifierTest
Change-Id: I07e3606a346b598d192771945335770ce964726e
2020-06-17 12:40:58 +01:00
TreeHugger Robot
18c664646e Merge "Remove feature flag, unused lib and test cases" into rvc-dev am: c34c144c6b am: 1af1b82a83 am: 3d22229d5d am: fa7ed2ebd9
Change-Id: I4570d8b03cde77fc9c86f99a079aed7a8f6d9fc2
2020-05-25 09:56:58 +00:00
TreeHugger Robot
fa7ed2ebd9 Merge "Remove feature flag, unused lib and test cases" into rvc-dev am: c34c144c6b am: 1af1b82a83 am: 3d22229d5d
Change-Id: I99c5f17bafc89ff05eb8840815c0a090a2979e3c
2020-05-25 09:33:30 +00:00
TreeHugger Robot
1c0a902b50 Merge "Remove feature flag, unused lib and test cases" into rvc-dev am: c34c144c6b
Change-Id: I7b11c6a44187a47e8fd6d2c8ceb78ae979e392f1
2020-05-25 09:14:45 +00:00
Sunny Shao
ffc352b9f9 Remove feature flag, unused lib and test cases
Fixes: 155949554
Test: make RunSettingsLibRoboTests -j56
Change-Id: I54a31aed503f7f058887720ab4fe01ca2f39ff93
2020-05-25 13:38:54 +08:00
Dmitri Plotnikov
f800b70dc5 Move IndentingPrintWriter to android.util
The old implementation remains in its place for now.

IndentingPrintWriter is still hidden - it will be made public
separately.

Test: atest FrameworksUtilTests:android.util.IndentingPrintWriterTest
Bug: 142281756

Change-Id: Idd2bfa027733ef384b5a676866a89fb3c35b06cb
2020-05-21 10:36:53 -07:00
TreeHugger Robot
29993af18b Merge "Properly keep compatibility with openRead() during a write." into rvc-dev am: beac47b12e am: 2e7334ebd3 am: ca13677e7d am: 2fe9669565
Change-Id: Ic3d81c597c5403d0eaf7b97034bbca8f0a9aa3aa
2020-05-21 00:09:30 +00:00
TreeHugger Robot
b58b389722 Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev am: 5c77ec2e12 am: 9481bbbfd6
Change-Id: I890261814a306e368617e06fbed35e82f8710f6d
2020-05-20 23:30:01 +00:00
TreeHugger Robot
1a98904a4d Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev am: 5c77ec2e12
Change-Id: I55bea05329df3bf9f1a0ee9241e941a9c1a8969d
2020-05-20 23:22:53 +00:00
TreeHugger Robot
5c77ec2e12 Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev 2020-05-20 23:20:42 +00:00
TreeHugger Robot
2e7334ebd3 Merge "Properly keep compatibility with openRead() during a write." into rvc-dev am: beac47b12e
Change-Id: If95f53c18b9e78594904142a531687e6db250534
2020-05-20 23:05:41 +00:00
TreeHugger Robot
39058b5b08 Merge "Maintain compatibility by deleting target directory before renaming into it." 2020-05-20 21:35:23 +00:00
Hai Zhang
30afab690e Properly keep compatibility with openRead() during a write.
Bug: 157092639
Test: atest AppIdleHistoryTests#testFilesCreation
Change-Id: I7d6808139aa41b25715293207b8ad42f9f42ef65
2020-05-20 14:15:12 -07:00
Hai Zhang
07b1ddf0ff Maintain compatibility by deleting target directory before renaming into it.
The target shouldn't be a directory, but if it is, it would be
deleted (as long as it's empty). This became some kind of API and we
need to remain compatible with it.

Bug: 151959443
Test: Reboot and ensure ShortcutService can persist its state
Change-Id: I11a80cd4252128b025912b7aab86b113935e549a
2020-05-20 12:43:38 -07:00
Hai Zhang
cf2ee87fd4 Maintain compatibility by deleting target directory before renaming into it.
The target shouldn't be a directory, but if it is, it would be
deleted (as long as it's empty). This became some kind of API and we
need to remain compatible with it.

Bug: 151959443
Test: Reboot and ensure ShortcutService can persist its state
Change-Id: I11a80cd4252128b025912b7aab86b113935e549a
Merged-In: I11a80cd4252128b025912b7aab86b113935e549a
2020-05-20 12:08:41 -07:00
TreeHugger Robot
3c02e858be Merge "Don't delete the new file in openRead()." into rvc-dev am: c74a76863b am: 990a07462b am: 441824370e am: f4ac6d5669
Change-Id: I1bc66212d98449dc5c2301c22fe79c80304cb88e
2020-05-20 08:58:56 +00:00
TreeHugger Robot
f4ac6d5669 Merge "Don't delete the new file in openRead()." into rvc-dev am: c74a76863b am: 990a07462b am: 441824370e
Change-Id: I736c8a45fef1d1d9d802c7f573bf156e9364a76e
2020-05-20 08:32:49 +00:00
TreeHugger Robot
79778d0914 Merge "Don't delete the new file in openRead()." into rvc-dev am: c74a76863b
Change-Id: Id8e7c41830942c4bf379aebce54c77af30c47e46
2020-05-20 08:03:10 +00:00
Hai Zhang
25adf3c471 Don't delete the new file in openRead().
Although it may seems a left-over from a previous interrupted write,
actually there are callers who call startWrite(), openRead() and then
finishWrite(), and this was okay in the previous implementation, so we
have to keep supporting it.

The new file is virtually ignored in the new implementation, and we
have no good way to know if it's actually a left-over or one that's
being written, so simply leaving it there is also okay.

Fixes: 157092639
Test: atest AppIdleHistoryTests#testFilesCreation
Change-Id: I4dc7fde99d2b8e04356f082a6e6ad61c2835022e
2020-05-19 20:35:51 -07:00
TreeHugger Robot
f086752432 Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 37f0ad1b43 am: 0f26ad2b9f
Change-Id: I308812fc88c3a41e327660fbd70dc0f7b1538dbe
2020-05-19 07:34:03 +00:00
TreeHugger Robot
85d6bd2b4a Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c
Change-Id: I051141c14e25172a9cad897b3d69bf9fbfeae9d9
2020-05-19 06:57:30 +00:00
Hai Zhang
b1a7706716 Change AtomicFile to use rename-into-place.
The previous implementation of backing up beforehand doesn't handle
the case where the file is created for the first time, and might leave
a corrupted file in case of failure.

This new implementation creates a new file for writing data into, and
renames it into the place of the original file after writing
finished.

Fixes: 151959443
Test: atest android.util.AtomicFileTest
Change-Id: I5c4c438526a2aecdd2af18f71e16b41a05817c61
Merged-In: I5c4c438526a2aecdd2af18f71e16b41a05817c61
2020-05-19 00:27:32 +00:00
Hai Zhang
4035e6e125 Change AtomicFile to use rename-into-place.
The previous implementation of backing up beforehand doesn't handle
the case where the file is created for the first time, and might leave
a corrupted file in case of failure.

This new implementation creates a new file for writing data into, and
renames it into the place of the original file after writing
finished.

Fixes: 151959443
Test: atest android.util.AtomicFileTest
Change-Id: I5c4c438526a2aecdd2af18f71e16b41a05817c61
2020-05-18 17:21:13 -07:00