654670 Commits

Author SHA1 Message Date
Xin Li
5ae099b977 Merge "Merge SP1A.210812.016" into stage-aosp-master 2021-09-29 05:31:38 +00:00
Luke Huang
2c500e21bd Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: Id0f1e097c9903897a35846e0ec6026d29228a39a
2021-09-29 03:50:49 +00:00
Luke Huang
2adba7dd4a Merge "Keep the native mdns daemon alive for pre-S application" 2021-09-29 03:35:20 +00:00
TreeHugger Robot
f2753ce65f Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master 2021-09-28 21:09:57 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +00:00
Treehugger Robot
5f35a1d2d3 [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: Ia70e96971d08dd32587c38e344e97f145573ba0d
2021-09-28 17:29:20 +00:00
Treehugger Robot
d801feda70 Merge "Fix stuck HDMI-CEC actions after boot" 2021-09-28 17:16:41 +00:00
William Escande
ce093d6738 Expose Phone.ENTERPRISE_CONTENT_URI as systemApi
Also add INTERACT_ACROSS_USERS as a requires permission
Bug: 194119078
Tag: #refactor
Test: Build

Change-Id: Iccc093d9224ed34eb76e64561607dac6085cb876
2021-09-28 18:11:33 +02:00
Mohammad Islam
430ef242c4 [automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

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

Change-Id: If953a25bd4c4a03cd336570a7dd7113db161542e
2021-09-28 15:56:13 +00:00
Mohammad Islam
0fe46d947a Merge "Fix broken test on GSI branch" 2021-09-28 15:37:08 +00:00
TreeHugger Robot
310bf06da5 Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master 2021-09-28 14:13:04 +00:00
Yan Han
85b7711700 Fix stuck HDMI-CEC actions after boot
Ensures that all queued actions on local devices are started after
boot. Previously, an unstarted SendKeyAction could stick around after
boot, blocking any future SendKeyAction from being created.

Unit tests omitted because of AOSP incompatibilities.

Bug: 193188675
Test: atest HdmiControlServiceTest#normalBoot_queuedActionsStartedAfterBoot

      manual test: spam volume up on boot with IR volume control enabled

Change-Id: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
Merged-In: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
(cherry picked from commit 22dc89a89f869335df3879c09e7337c5b3967e85)
2021-09-28 14:00:48 +00:00
TreeHugger Robot
5d7bfac82a Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master 2021-09-28 14:00:03 +00:00
Yan Han
62eafa258a Fix stuck HDMI-CEC actions after boot
Ensures that all queued actions on local devices are started after
boot. Previously, an unstarted SendKeyAction could stick around after
boot, blocking any future SendKeyAction from being created.

Bug: 193188675
Test: atest HdmiControlServiceTest#normalBoot_queuedActionsStartedAfterBoot

      manual test: spam volume up on boot with IR volume control enabled

Change-Id: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
Merged-In: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
(cherry picked from commit 22dc89a89f869335df3879c09e7337c5b3967e85)
(cherry picked from commit 66b6a8cc17d3c2f4d7d3a09369f7538633c43259)
2021-09-28 12:22:10 +00:00
William Escande
921efdf1bd Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master 2021-09-28 12:00:08 +00:00
Anton Hansson
b370ca080a Merge "Add a tool for merging annotation.zip files" am: 0e4260d772
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I3f2685923a00e0ef8bf9c6261eae93b5ede287b0
2021-09-28 10:46:16 +00:00
TreeHugger Robot
b4f626d13e Merge changes from topic "expose-pending-intent" into stage-aosp-master
* changes:
  Reduce PendingIntent memory allocation
  Expose PendingIntent.addCancelListener
2021-09-28 10:39:52 +00:00
Mohammad Samiul Islam
10284429b8 Merge "Fix broken test on GSI branch" into stage-aosp-master 2021-09-28 10:36:09 +00:00
Anton Hansson
0e4260d772 Merge "Add a tool for merging annotation.zip files" 2021-09-28 10:27:22 +00:00
Xin Li
73dba779b2 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged
Merged-In: I59d1aa9bf89cf29d59e72207d4e8e5900c4d5666
Change-Id: Idd10f8e55c4ec1d7e158e8627f10debccccb177c
2021-09-28 07:55:17 +00:00
Treehugger Robot
799b63acc2 Merge "Update permissions OWNERS" am: dbbb827a79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838051

Change-Id: Ic4d3da57e701c0da40c55bd44d73df0edce9a911
2021-09-28 04:19:01 +00:00
Treehugger Robot
dbbb827a79 Merge "Update permissions OWNERS" 2021-09-28 04:04:52 +00:00
Evan Severson
73ebf86c32 Update permissions OWNERS
Bug: 201319595
Test: None
Change-Id: Iebb9cd731b592df2dfb79bd088e917635c21b6b1
2021-09-28 01:03:32 +00:00
Treehugger Robot
86ac824eb9 Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I5d572a1b11cf7025251b30c6257f0fe854185aea
2021-09-28 00:13:14 +00:00
Treehugger Robot
3b63045444 Merge "Set verbosity for api_versions_trimmer_unittests" 2021-09-27 23:56:35 +00:00
Treehugger Robot
7034d646d5 [automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -s ours
am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8cbc is already in history

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

Change-Id: I95a5c891b6cf6d14f96d803dfd8db6ebe851879c
2021-09-27 23:34:49 +00:00
Treehugger Robot
3bf3a055c7 Merge "Backport multi user trace changes." 2021-09-27 23:22:14 +00:00
Gopinath Elanchezhian
33f29f1591 Backport multi user trace changes.
Bug: b/190233841

Test: Builds successfully
Change-Id: I9fb702d51eeac4749097ea34d44bf78c202a288a
Merged-In: I1661558dced6cb326ce11c94672b60f0352eab3c
2021-09-27 20:36:10 +00:00
Anton Hansson
e673784439 Add a tool for merging annotation.zip files
We now produce annotation.zip files individually for each module, but
for the public SDK it's easier to distribute a single zip file with
merged contents. Add a tool for merging these (simple) files.

Bug: 187397779
Test: unittest in cl
Test: diff tests in follow-on CL merging all module annotations.zip
Change-Id: Ic5bb94425dccafab43340805f73fafacab53cb28
2021-09-27 17:46:26 +01:00
Nathalie Le Clair
b700fc5efe [automerger skipped] Merge "HDMICEC: Add a new validation to CEC messages" am: 662af62f16 -s ours
am skip reason: Merged-In I274a9a2385d616784dfc891aabd8f335c32658da with SHA-1 e96fe8f40d is already in history

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

Change-Id: I1a3cc03cc9fe33d412c28db8c9bbc594c8c1873e
2021-09-27 13:47:16 +00:00
yangbill
8ebeef3b20 Set verbosity for api_versions_trimmer_unittests
Tradefed will need the python unit test verbosity to be set as 2 to make
the test cases information could be parsing correctly.

Bug: 201273904
Test: atest api_versions_trimmer_unittests
Change-Id: I414eb9ec18dbe45e9d2360a5c1baa0bc0b315170
2021-09-27 21:42:53 +08:00
Nathalie Le Clair
662af62f16 Merge "HDMICEC: Add a new validation to CEC messages" 2021-09-27 13:33:00 +00:00
Samiul Islam
2f6a6fdd48 Fix broken test on GSI branch
Both com.android.apex.cts.shim.v2_prebuilt and StagedInstallTestApexV2
provide the same artifact. Tests that are using StagedInstallTestApexV2
are passing, whereas tests using com.android.apex.cts.shim.v2_prebuilt
are failing.

Root cause has not been identified yet. Proactively swapping the targets
to get the test green.

Bug: 200737517
Test: atest StagedInstallInternalTest#testAdbStagedReadyWaitCanBeSkipped
Change-Id: Ibdd72ec062538838ad60b847ee1ff31a792520a3
Merged-In: Ibdd72ec062538838ad60b847ee1ff31a792520a3
2021-09-27 11:38:17 +00:00
Samiul Islam
ecafad4383 Fix broken test on GSI branch
Both com.android.apex.cts.shim.v2_prebuilt and StagedInstallTestApexV2
provide the same artifact. Tests that are using StagedInstallTestApexV2
are passing, whereas tests using com.android.apex.cts.shim.v2_prebuilt
are failing.

Root cause has not been identified yet. Proactively swapping the targets
to get the test green.

Bug: 200737517
Test: atest StagedInstallInternalTest#testAdbStagedReadyWaitCanBeSkipped
Change-Id: Ibdd72ec062538838ad60b847ee1ff31a792520a3
2021-09-27 11:37:48 +00:00
Paul
e96fe8f40d HDMICEC: Add a new validation to CEC messages
Add one more parameter to the isValid() method to indicate if the message that needs to be validated is sent or received by the device.

Add a filter that ignores received messages which have source's logical address equal to device's logical address.

Revise isValid() calls and tests affected by the change.

Edit HdmiControlServiceTest#handleCecCommand_errorParameter_returnsAbortInvalidOperand() test. Since the logical address Constants.ADDR_PLAYBACK_1 is already used by mPlaybackDeviceSpy the message's source is set to Constants.ADDR_PLAYBACK_2; otherwise HdmiCecMessageValidator#isValid() fails with a different error code than expected.

Bug: 198261021
Test: make && atest CtsHdmiCecHostTestCases
Change-Id: I274a9a2385d616784dfc891aabd8f335c32658da
(cherry picked from commit c3d3e32e50fe162f40d69f9f204468a30ea3e201)
2021-09-27 11:00:16 +00:00
Makoto Onuki
41b8d147fd Reduce PendingIntent memory allocation
Fix: 195146423
Test: atest android.app.cts.PendingIntentTest

Change-Id: I246d272c77337f77623f0c11d5f445895cdbf5e8
2021-09-27 09:35:58 +00:00
Makoto Onuki
30bd1bb72d Expose PendingIntent.addCancelListener
Bug: 195146423
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I74e6ae49bfb2b31f0bc693d75e1f1433206011ce
2021-09-27 09:35:48 +00:00
Treehugger Robot
86170faab2 Merge "fix google widget timing issue" am: 56db11dfc2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782431

Change-Id: I6d2490247f198ff5f04c064956dbd252b35204c4
2021-09-24 19:15:07 +00:00
Treehugger Robot
56db11dfc2 Merge "fix google widget timing issue" 2021-09-24 18:57:13 +00:00
Paul
bbdceb9593 HDMICEC: Add a new validation to CEC messages
Add one more parameter to the isValid() method to indicate if the message that needs to be validated is sent or received by the device.

Add a filter that ignores received messages which have source's logical address equal to device's logical address.

Revise isValid() calls and tests affected by the change.

Edit HdmiControlServiceTest#handleCecCommand_errorParameter_returnsAbortInvalidOperand() test. Since the logical address Constants.ADDR_PLAYBACK_1 is already used by mPlaybackDeviceSpy the message's source is set to Constants.ADDR_PLAYBACK_2; otherwise HdmiCecMessageValidator#isValid() fails with a different error code than expected.

Bug: 196943901
Bug: 198261021
Test: make && atest CtsHdmiCecHostTestCases
Change-Id: I274a9a2385d616784dfc891aabd8f335c32658da
Merged-In: I274a9a2385d616784dfc891aabd8f335c32658da
2021-09-24 11:39:58 +00:00
Treehugger Robot
6b6d1da5f3 Merge "VintfObject.getHalNamesAndVersions report AIDL version number." am: c39842abd9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832955

Change-Id: Ib31bb867e346fb693b7c2c1aeace30f8946eb469
2021-09-24 01:20:43 +00:00
Yifan Hong
8804125b5b Merge "Add owners for VINTF." am: ec854a738f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1835453

Change-Id: I59ba7ecbdaf201d6ea66bdf003efe2510a3ee8ee
2021-09-24 01:19:55 +00:00
Treehugger Robot
c39842abd9 Merge "VintfObject.getHalNamesAndVersions report AIDL version number." 2021-09-24 01:03:34 +00:00
Yifan Hong
ec854a738f Merge "Add owners for VINTF." 2021-09-24 01:03:21 +00:00
Yifan Hong
de452e49af VintfObject.getHalNamesAndVersions report AIDL version number.
Tests that rely on this API does not attempt
to parse it, but rather treat this as an opaque
string and upload them.

Test: pass
Bug: 200729012
Change-Id: I025e2602ab506ad009ce48d6329a230f12f1060c
2021-09-23 13:21:35 -07:00
Yifan Hong
4510a23652 Add owners for VINTF.
Test: pass
Change-Id: I24b73fd00bafd8a3c2fdfdecc1c00179a18b2e89
2021-09-23 13:21:35 -07:00
Bernardo Rufino
278a00a8d3 Merge "Synchronize in LazyValue.get()" am: 92b71e564f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829879

Change-Id: I75902d42568bc7e7f18033ab8f228ff2cbc94058
2021-09-23 17:04:39 +00:00
Bernardo Rufino
92b71e564f Merge "Synchronize in LazyValue.get()" 2021-09-23 16:48:49 +00:00
Jacob Hobbie
f76e50ba48 Cherrypicking flags and override methods for allowing dynamically
registered receivers to mark themselves explicitly as exported or not
exported.

Test: will add tests with enforcement
Change-Id: I9a16f566c54e389743dcf460734ecdc0b1081768
2021-09-23 08:20:04 -07:00
Treehugger Robot
83a970d901 Merge "Migrate IPsec modules to use state machine lib" am: 4e23d56de4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1834516

Change-Id: Ic803f5ca7acc720e0291caacb414c6ef453bebd0
2021-09-23 14:53:03 +00:00