Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,446 Commits 3 Branches 0 Tags
758ba2ec437ad33d82fe0449a541cddcb96224b4
Commit Graph

485446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
758ba2ec43 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:48:29 +00:00
TreeHugger Robot
054e4c7644 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 20:44:40 +00:00
Bill Yi
1824b046dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0861fbec5be9cd1608d65ed19a91b12bd4e8680a
 2021-04-10 05:59:16 -07:00
Bill Yi
de51b99410 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If33fd0fc9c282685102a49be891bdfd166c5ca77
 2021-04-10 04:53:16 -07:00
TreeHugger Robot
ccaeb0f6c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-10 05:54:38 +00:00
Bill Yi
579e127fcc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3fea20a6505394081e9a89ba6d09d5b4f52061b3
 2021-04-09 19:40:24 -07:00
Bill Yi
b621bc46a0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia0e24c92e2a7e7162b347fb23f3d73da4e177709
 2021-04-09 02:59:26 -07:00
Santiago Seifert
1a4c5c4723 Fix MediaParser's TEST_MAPPING 
Bug: 184704729
Test: N/A.
Change-Id: I52b224670be545aa00120a8560440b18b6e11767
Merged-In: I52b224670be545aa00120a8560440b18b6e11767
 2021-04-07 10:57:48 +00:00
Chris Tate
d894cc9d01 Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I30befd7e02b0765e985be2f5eac50eddcd0309c8
 2021-04-06 16:54:45 +00:00
Christopher Tate
c3a36e5830 DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 8cb7e0a881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155

Change-Id: I1bf03cf9731b3e6b7a3397da120faf0368d199a0
 2021-04-06 16:54:43 +00:00
Chris Tate
68a604b920 Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev 2021-04-06 16:23:21 +00:00
TreeHugger Robot
495b0c81af Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-06 06:35:21 +00:00
Bill Yi
0487bd8726 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ca45196d3451fcef910cc7a94a88de1da1910b7
 2021-04-05 20:12:28 -07:00
Bill Yi
d13818913e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I11c05bfd9e5dd54757b5b10743815f10f5356f39
 2021-04-05 12:09:45 -07:00
Beth Thibodeau
00a6f2101d Merge "Increase maximum allowed size for status bar icons" into rvc-dev am: 4fdf4a5cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054273

Change-Id: I4976cc5dcdfb5d0d4c8d7337488ed6bc453b0c36
 2021-04-02 22:15:29 +00:00
Beth Thibodeau
4fdf4a5cee Merge "Increase maximum allowed size for status bar icons" into rvc-dev 2021-04-02 21:35:43 +00:00
Beth Thibodeau
001d4e68bb Increase maximum allowed size for status bar icons 
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 5cd7976f7d)
 2021-04-01 18:16:52 +00:00
Miranda Kephart
b7ee17360d Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a745 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908

Change-Id: I5d0bb645ea4bcd6e216dbbb1135f683c11d85a02
 2021-04-01 15:28:30 +00:00
Miranda Kephart
fe43075ab2 [DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13950908

Change-Id: I1915287a4b0780bcd61ae4c8e26808185a24263c
 2021-04-01 15:28:26 +00:00
Miranda Kephart
637a90a745 Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev 2021-04-01 14:51:05 +00:00
Jimmy Chen
cd05cf4aa7 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: I0e02f1d3d7ab499b605354725792a02c0749aec9
 2021-04-01 02:40:12 +00:00
Jimmy Chen
3d6cf521c1 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev 2021-04-01 01:42:20 +00:00
TreeHugger Robot
21f28e69e1 Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod 2021-03-31 10:45:57 +00:00
Lorenzo Colitti
aa7de1bfcd BroadcastInterceptingContext: use passed-in broadcast Handler. 
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-31 18:28:14 +09:00
Anton Hansson
7d5365b2f8 Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod 2021-03-30 17:10:25 +00:00
Anton Hansson
374770e158 Revert "Add SuppressLint to framework-annotations-lib" 
This reverts commit 2157c89792.

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-30 15:18:00 +00:00
TreeHugger Robot
5a3b485ef1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 18:46:28 +00:00
TreeHugger Robot
8066155562 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 18:45:38 +00:00
TreeHugger Robot
2f7335af67 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 18:42:10 +00:00
TreeHugger Robot
96d198497a Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 18:38:01 +00:00
Bill Yi
338aa55227 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12448e1128efcc8ad6277dc46dbe45595704e937
 2021-03-27 09:37:10 +00:00
Bill Yi
5bf151bbfa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e491f2f3aea7881d79d89617a9367897311442a
 2021-03-27 09:18:03 +00:00
Bill Yi
c984370412 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2604d8d721d1c89535b42ee0a1eb4249fef484ec
 2021-03-27 08:01:41 +00:00
TreeHugger Robot
a2cac0fdeb Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 06:49:39 +00:00
TreeHugger Robot
65ab641cae Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 06:48:48 +00:00
TreeHugger Robot
3225d1e6ad Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-27 06:45:57 +00:00
Bill Yi
3b48c716b5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3e15ec1c23c07234e740c42c967feb8088073982
 2021-03-27 06:41:46 +00:00
Bill Yi
4cd1683054 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0d0795f2c00dfaebaff9d38cbafa119a33231e53
 2021-03-27 05:18:57 +00:00
Bill Yi
bb3ccc072b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id0479191e91ddcf6efa04890127e7ef4450ffe6d
 2021-03-27 02:35:14 +00:00
Bill Yi
5a80288f22 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6fd5d3b4002e39817c71714d1b96844ce721258a
 2021-03-27 01:17:36 +00:00
Miranda Kephart
cdd1d2a4fe [DO NOT MERGE] Make PendingIntents in screenshots immutable 
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 ba571eaa74)
 2021-03-25 13:38:14 +00:00
TreeHugger Robot
a7e812a641 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-25 06:10:07 +00:00
Bill Yi
d398ba825f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6de82e99f296bf9deb703b49e61f1cbfdd77db6b
 2021-03-25 00:11:20 +00:00
Bill Yi
16ff991edd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3281b14e1b8d721886031ab6831cd38508dae906
 2021-03-22 08:52:05 +00:00
Christopher Tate
8cb7e0a881 DO NOT MERGE - Disallow deletion of channels with FGS notifications 
Bug: 156090809
Test: atest CtsAppTestCases:NotificationManagerTest
Test: atest CtsAppTestCases:android.app.cts.ServiceTest
Change-Id: I1c2bb78d86f194585d273661cecf3419f51965df
(cherry picked from commit 39b3890268913bc2dc8b90671d042c0e9b4090d2)
 2021-03-18 08:11:45 -07:00
TreeHugger Robot
57ac59568c Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320

Change-Id: Id5810e50b56389fe53f739f84ad79d8ef878e4f6
 2021-03-17 09:15:05 +00:00
Lorenzo Colitti
134a538d0b Backport test coverage from aosp/1547496. am: 1255ddbc76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319

Change-Id: I559be41c77cc6348e745324ab675c603b1f3ad1d
 2021-03-17 09:15:02 +00:00
Lorenzo Colitti
04daf7b175 Backport some helpers in ConnectivityServiceTest. am: be317557fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318

Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06
 2021-03-17 09:14:59 +00:00
Lorenzo Colitti
6056ae9588 Test for bugs with suspended VPN underlying networks. am: 9687fd7c3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425317

Change-Id: I28f2b0f682d8ee2982b8669267efe43ae0805778
 2021-03-17 09:14:57 +00:00
Lorenzo Colitti
53603b1210 Add a test for getDefaultNetworkCapabilitiesForUser. am: cb2feba0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425316

Change-Id: Ic3b3584c25a0703aa273b47d042b2b339f1de2e7
 2021-03-17 09:14:54 +00:00