summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-09Snap for 7272189 from b621bc46a02b5818c4ea177d166f7ee61370a3cc to ↵android-mainline-11.0.0_r39android11-mainline-media-releaseandroid-build-team Robot
mainline-media-release Change-Id: I1ae7e243a484e7f7e3c7224df7a50a938c0aee7f
2021-04-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia0e24c92e2a7e7162b347fb23f3d73da4e177709
2021-04-07Fix MediaParser's TEST_MAPPINGSantiago Seifert
Bug: 184704729 Test: N/A. Change-Id: I52b224670be545aa00120a8560440b18b6e11767 Merged-In: I52b224670be545aa00120a8560440b18b6e11767
2021-04-06Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" ↵Chris Tate
into rvc-dev am: 68a604b920 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155 Change-Id: I30befd7e02b0765e985be2f5eac50eddcd0309c8
2021-04-06DO NOT MERGE - Disallow deletion of channels with FGS notifications am: ↵Christopher Tate
8cb7e0a881 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155 Change-Id: I1bf03cf9731b3e6b7a3397da120faf0368d199a0
2021-04-06Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" ↵Chris Tate
into rvc-dev
2021-04-06Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-04-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I8ca45196d3451fcef910cc7a94a88de1da1910b7
2021-04-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I11c05bfd9e5dd54757b5b10743815f10f5356f39
2021-04-05Snap for 7259092 from 00a6f2101d3d87a7b5b08b3fceedefb102fba09a to ↵android-build-team Robot
mainline-media-release Change-Id: I2614ec42f1c6f6ba25076dbe1c73b39e921d275e
2021-04-02Merge "Increase maximum allowed size for status bar icons" into rvc-dev am: ↵Beth Thibodeau
4fdf4a5cee Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054273 Change-Id: I4976cc5dcdfb5d0d4c8d7337488ed6bc453b0c36
2021-04-02Merge "Increase maximum allowed size for status bar icons" into rvc-devBeth Thibodeau
2021-04-01Increase maximum allowed size for status bar iconsBeth Thibodeau
The previous size was causing some apps to crash which otherwise worked fine. This more closely matches the hard limit in RecordingCanvas (which we need to stay below to prevent SystemUI from crashing). Fixes: 182891864 Fixes: 182232777 Bug: 169255797 Test: atest StatusBarIconViewTest Test: manual - posting notifications with different drawable sizes Change-Id: I8deacc651e05a202ec980eeb8bcdf4f92daea8eb (cherry picked from commit 5cd7976f7d2b702f803f0628f61f02491834cd41)
2021-04-01Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into ↵Miranda Kephart
rvc-dev am: 637a90a745 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908 Change-Id: I5d0bb645ea4bcd6e216dbbb1135f683c11d85a02
2021-04-01[DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4feMiranda Kephart
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908 Change-Id: I1915287a4b0780bcd61ae4c8e26808185a24263c
2021-04-01Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-devMiranda Kephart
2021-04-01Merge "wifidisplay: restrict broadcast by the proper permission" into ↵Jimmy Chen
rvc-dev am: 3d6cf521c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717 Change-Id: I0e02f1d3d7ab499b605354725792a02c0749aec9
2021-04-01Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-devJimmy Chen
2021-03-31Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into ↵TreeHugger Robot
mainline-prod
2021-03-31BroadcastInterceptingContext: use passed-in broadcast Handler.Lorenzo Colitti
Currently, BroadcastInterceptingContext always runs broadcast receivers on the thread that called sendBroadcast. This means: 1. Receivers might run on the wrong thread, making the test less realistic. 2. If any receiver checks what thread it's running on, then either the check needs to be modified or deleted, or the test must call sendBroadcast on the thread that the receiver expects to run on. The latter is impossible when there is more than one receiver that needs to run on more than one thread. This CL adds a setUseRegisteredHandlers method that allows tests to say that they want each receiver to run on the Handler specified at registration time. This CL also enables the new mode for ConnectivityServiceTest, and resolves a TODO to re-enable a disabled thread check. The new mode cannot be enabled by default because it would break most of the tests. [This is a partial cherry-pick of an AOSP change that also made changes to ConnectivityServiceTest, and which conflicts in mainline-prod. This CL only includes the changes to BroadcastInterceptingContext.] Bug: 173331190 Test: atest TetheringTests Merged-In: I3303bb14516f07a55d82a16b59c111ab3f8b0389 Change-Id: I95c2371d4e9f51aab2bc6e6368d133e8a75987cd
2021-03-30Merge "Revert "Add SuppressLint to framework-annotations-lib"" into ↵Anton Hansson
mainline-prod
2021-03-30Revert "Add SuppressLint to framework-annotations-lib"Anton Hansson
This reverts commit 2157c89792864c199ba023f4ff3e6b6fa55967f2. Reason for revert: Not the right fix. SuppressLint is apparently in the SDK, so modules should be picking it up from there. Change-Id: I7fdca1e4c30f897a77eb348f92d3ca18d2175dff
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I12448e1128efcc8ad6277dc46dbe45595704e937
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7e491f2f3aea7881d79d89617a9367897311442a
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2604d8d721d1c89535b42ee0a1eb4249fef484ec
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3e15ec1c23c07234e740c42c967feb8088073982
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0d0795f2c00dfaebaff9d38cbafa119a33231e53
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id0479191e91ddcf6efa04890127e7ef4450ffe6d
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6fd5d3b4002e39817c71714d1b96844ce721258a
2021-03-25[DO NOT MERGE] Make PendingIntents in screenshots immutableMiranda Kephart
S and later will require PendingIntents to explicitly specify whether they are mutable or immutable. Bug: 182166925 Bug: 162738636 Test: manual, just a flag change (tested that normal screenshot flow works, verified that the log nags for unspecified mutability disappeared) Change-Id: I79b78f80c2d6af07a3826b6f79d0d86a5fc2f756 (cherry picked from commit ba571eaa74daaf39c1ae544c886bc3c2a4a21974)
2021-03-25Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot
2021-03-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6de82e99f296bf9deb703b49e61f1cbfdd77db6b
2021-03-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3281b14e1b8d721886031ab6831cd38508dae906
2021-03-18DO NOT MERGE - Disallow deletion of channels with FGS notificationsChristopher Tate
Bug: 156090809 Test: atest CtsAppTestCases:NotificationManagerTest Test: atest CtsAppTestCases:android.app.cts.ServiceTest Change-Id: I1c2bb78d86f194585d273661cecf3419f51965df (cherry picked from commit 39b3890268913bc2dc8b90671d042c0e9b4090d2)
2021-03-17Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into ↵TreeHugger Robot
rvc-dev am: 65eb4a4332 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320 Change-Id: Id5810e50b56389fe53f739f84ad79d8ef878e4f6
2021-03-17Backport test coverage from aosp/1547496. am: 1255ddbc76Lorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319 Change-Id: I559be41c77cc6348e745324ab675c603b1f3ad1d
2021-03-17Backport some helpers in ConnectivityServiceTest. am: be317557feLorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318 Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06
2021-03-17Test for bugs with suspended VPN underlying networks. am: 9687fd7c3bLorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317 Change-Id: I28f2b0f682d8ee2982b8669267efe43ae0805778
2021-03-17Add a test for getDefaultNetworkCapabilitiesForUser. am: cb2feba0fbLorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316 Change-Id: Ic3b3584c25a0703aa273b47d042b2b339f1de2e7
2021-03-17Improve testing of CONNECTIVITY_ACTION broadcasts. am: 4a66aedf09Lorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425315 Change-Id: I889026eec095745be2e88f0c38392619c8ae6cfd
2021-03-17Test passing an underlying network array with null network in it. am: 1a05734c87Lorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425314 Change-Id: I7c78a186187db9c77c8980b670f802f9fd2e42ce
2021-03-17Make testVpnNetworkActive more deterministic. am: d2adbfbf40Lorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425313 Change-Id: I5b7901958bf96b0cee80c6124e004e57da0992cd
2021-03-17Make MockVpn more realistic and easier to use. am: f3d35fdeaaLorenzo Colitti
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425312 Change-Id: I0e1ff975206ed180744c4c7a6f42e00b95589424
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:33:39 +0000