Commit Graph

1601 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
44a98caa0d Merge "Enable the settings_controller_loading_enhancement" into rvc-dev am: 8011ca6185
Change-Id: Icb943e21b321149a4f9f913f90d08f977b3eac79
2020-05-05 09:34:13 +00:00
Sunny Shao
8bdf700088 Enable the settings_controller_loading_enhancement
- Enable some settings pages to use paralleled loading approach.

Bug: 137558156
Test: compilation
Change-Id: I7302de2413c14a7573adf2f9949ac28866557e2f
2020-05-04 08:44:15 +08:00
Andrew Sapperstein
f181c2f44b Fix broken @see tags in public documentation. am: 8fe35e5f21
Change-Id: Ic95104f61b736d05f18c7465e77951771f39fcbf
2020-05-02 00:36:07 +00:00
Andrew Sapperstein
8fe35e5f21 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Exempt-From-Owner-Approval: cherry-picked from master
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
(cherry picked from commit e0624c7a40)
2020-05-01 18:25:32 +00:00
Jing Ji
47ae64c03f Merge "Fix test failure in testProcessStateByPulling" into rvc-dev am: b344e0ac95
Change-Id: I0e850a76c5c56d3d0eb7790f7726330ce7a9f694
2020-04-24 23:13:17 +00:00
Jing Ji
468e6c3909 Fix test failure in testProcessStateByPulling
Added a new flag "--statsd" to dumpsys procstats, it'll dump
the identical protobuf data as the one being sent to statsd;
these data is aggregated/reduced.  The tradtional "--proto"
is still supported in case the full data is needed.

Align the ProcStats's proto message definition with the statsd.

Fixed various other issues with ProcStats's dumping.

Bug: 148542701
Test: atest ProcStatsValidationTests
Change-Id: I5a22603bfbc97bfac93179289df839710364677d
2020-04-24 05:01:22 -07:00
TreeHugger Robot
8bfdc107cc Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada
Change-Id: I7cb2dde555ac4480d3ad18c675f3a6466184345b
2020-04-07 03:58:21 +00:00
TreeHugger Robot
5eb9c8fada Merge "Store conversation requirement in a setting" into rvc-dev 2020-04-07 03:47:02 +00:00
Julia Reynolds
e24faa2c86 Store conversation requirement in a setting
So we can show it in developer options. Also fix a bug
where the setting wasn't being respected in systemui.

Test: atest
Bug: 152907434
Change-Id: I1eaed93a0c8a1ec4486c7072972e2f924402bb94
2020-04-02 16:28:40 -04:00
Soonil Nagarkar
1c5388e7b0 Merge "Fix up LocationRequest and ProviderRequest" into rvc-dev am: 240eaaaaab
Change-Id: I9c69e5a0718ab31f04ed4076af5f6e54eb149c50
2020-04-02 19:01:08 +00:00
Fredrik Roubert
f030962cce Merge "Add "ftp" to the list of URL schemes that get linkified." am: cc7a0e7152 am: d13a70de57
Change-Id: I0a0099a4fdc1bcdf76d097313f4f938f3bf9049b
2020-04-01 19:21:38 +00:00
Soonil Nagarkar
c4f8716720 Fix up LocationRequest and ProviderRequest
-Use more idiomatic and efficient parceling
-Cleanup LocationRequest a bit

Bug: 151026407
Test: presubmits
Change-Id: I3865421a128417a5096e39ee110139a13ab9ab3b
2020-04-01 11:06:12 -07:00
Fredrik Roubert
0b4907e839 Add "ftp" to the list of URL schemes that get linkified.
Fixes: 152892738
Change-Id: I888c5b12ebb417309250a25dc70baedad2cf7d7c
2020-03-31 21:40:41 +02:00
TreeHugger Robot
c6f4f74723 Merge "V4 uses V2 digest if V3 is not available." into rvc-dev 2020-03-25 01:36:01 +00:00
Alex Buynytskyy
6b7efbc4b9 V4 uses V2 digest if V3 is not available.
Test: atest PackageManagerShellCommandIncrementalTest
Bug: b/151240006
Change-Id: I242b599e434880ce218537574e879e9436e5d3da
2020-03-24 14:34:52 -07:00
Joe Onorato
8006029ec9 Address API Council comments for ProtoOutputStream
Bug: 148011305
Bug: 148966916
Test: m && m offline-sdk-docs
Change-Id: I0aeeb74329a90706999d6103b7da2e239f4a369e
2020-03-23 20:41:24 -07:00
TreeHugger Robot
87500a84a4 Merge "Make Log.isLogagble @FastNative" into rvc-dev 2020-03-23 20:25:39 +00:00
Makoto Onuki
8e81742dc0 Make Log.isLogagble @FastNative
This CL doens't change println_native() because:
- To avoid potential risks (jank?) because it's kind of late in the RVC
cycle.
- The JNI overhead is unlikely to be a major problem in logging. If apps
are making *that* many log calls, that itself would be a bigger
problem.

Test: treehugger / boot
Bug: 152217649
Change-Id: I86aeb62b217e5331e6bbd02a0ba592fd050a41b2
2020-03-23 17:19:05 +00:00
Jason Chiu
8234820115 Enable the feature flag for contextual home v2
Bug: 149274976
Test: rebuild
Change-Id: Id3af8c6cae731222236a510a10cbeb9937004862
2020-03-23 17:20:56 +08:00
Ruslan Tkhakokhov
3a0df8a06c Merge "Enable SETTINGS_DO_NOT_RESTORE_PRESERVED by default" into rvc-dev 2020-03-18 11:48:15 +00:00
TreeHugger Robot
173eb0db9b Merge "[framework] Extract v3 digest for v4 checking correctly" into rvc-dev 2020-03-17 21:22:35 +00:00
Yurii Zubrytskyi
087cf41e51 [framework] Extract v3 digest for v4 checking correctly
Use the same ordering of digest algorithms as the apksigner and
the general v3 checking do.

Test: adb install --incremental <apk> with v4 signature
Bug: b/151241461
Change-Id: I5c4c8339d7fd2ba127bd0f453efc9c04a8be7ac7
2020-03-17 09:49:08 -07:00
Rajeev Kumar
7cff642925 Merge "Revert "Enable settings_tether_all_in_one by default"" into rvc-dev 2020-03-17 03:09:23 +00:00
Zhen Zhang
e373051f01 Revert "Enable settings_tether_all_in_one by default"
This reverts commit ab42095409.

Reason for revert: b/151579796, b/151624169

Bug: 151579796
Change-Id: Ic398efd54e667a7f250ce0e7ac5082502a40078a
2020-03-16 19:21:21 +00:00
Khaled Abdelmohsen
2aee73b4e6 Close file streams
This is mainly refactoring, without any new logic.

Bug: 148005911
Test: Refactoring, presubmits are sufficient
Change-Id: I3b9b35f4a952edc04357a2c1b265b1d0f346d515
2020-03-15 23:29:33 +00:00
Khaled Abdelmohsen
2c89227525 Merge "Support multi apk stamp verification" into rvc-dev 2020-03-14 07:23:34 +00:00
Khaled Abdelmohsen
f6b1e8c3f6 Support multi apk stamp verification
Bug: 148005911
Test: atest FrameworksCoreTests:SourceStampVerifierTest
Change-Id: Iffab565a03ae57c469784baa12bec9cd130e69a1
2020-03-14 00:23:56 +00:00
Alex Buynytskyy
f5e605a00c Updated v4 signature processing.
Passing to libincfs.so.
Obtaining and verifying, including v3 digest check.

go/apk-v4-signature-format

Test: atest PackageManagerShellCommandTest
Bug: b/151241461
Change-Id: Id61f5716b9f9b55d6ab1ebca5a7ecb1c6e54570a
2020-03-13 15:13:25 -07:00