Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,927 Commits 3 Branches 0 Tags
6cb70458bf2a107f697a77d1b4394d0dc400a426
Commit Graph

638927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Biswarup Pal
6cb70458bf Merge "Free only the required bytes from StorageManagerService" into sc-dev am: 4f8d78e778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14034626

Change-Id: I55d39004b634400d4bf642fbb2cb60e87e0d39d0
 2021-04-01 10:50:47 +00:00
Biswarup Pal
4a761808ba Merge "Refactor FileUtils#convertToModernFd" into sc-dev am: 3d73c3ad22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13725034

Change-Id: Icccdbbd7d692159780ca6714f110008391d11cb2
 2021-04-01 10:50:35 +00:00
Chalard Jean
2bb91cdf7e Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 am: b139c0e716 am: 9d0057edb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: I2954b6923a07a51b521860a42355a9b0388c8bcf
 2021-04-01 10:50:23 +00:00
Jack Yu
cc85355a71 [automerger skipped] Merge "Display no data notification in certain scenarios" am: 39e56169aa am: 6d858e4d0b am: 31657c4990 -s ours am: 530356c5bc -s ours 
am skip reason: skip tag Change-Id Ica20169db3c9230172d2cae80a9e6ba3486bfa42 with SHA-1 5badb094f5 is already in history

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

Change-Id: Icf9229d58548a823e0a6e4cbaf3fc23e15769bcf
 2021-04-01 10:50:04 +00:00
Biswarup Pal
4f8d78e778 Merge "Free only the required bytes from StorageManagerService" into sc-dev 2021-04-01 10:35:15 +00:00
Biswarup Pal
3d73c3ad22 Merge "Refactor FileUtils#convertToModernFd" into sc-dev 2021-04-01 10:25:59 +00:00
Chalard Jean
9d0057edb6 Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 am: b139c0e716 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb
 2021-04-01 10:10:39 +00:00
Jack Yu
530356c5bc [automerger skipped] Merge "Display no data notification in certain scenarios" am: 39e56169aa am: 6d858e4d0b am: 31657c4990 -s ours 
am skip reason: skip tag Change-Id Ica20169db3c9230172d2cae80a9e6ba3486bfa42 with SHA-1 5badb094f5 is already in history

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

Change-Id: I96d06fba845b375617b22fe4f6d5ea6704039ef9
 2021-04-01 10:09:23 +00:00
Chalard Jean
b139c0e716 Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a
 2021-04-01 09:22:48 +00:00
Jack Yu
31657c4990 Merge "Display no data notification in certain scenarios" am: 39e56169aa am: 6d858e4d0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Icd2c42decc94c59189509e3f87115cf847b3a083
 2021-04-01 09:22:34 +00:00
Chalard Jean
7c5baffea6 Merge changes Ib5cd2c27,I4448a354 into sc-dev am: 0747b73939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14034625

Change-Id: I30b307caa22b478542a9e51b612d875884f1c8c9
 2021-04-01 09:14:39 +00:00
Chalard Jean
0747b73939 Merge changes Ib5cd2c27,I4448a354 into sc-dev 
* changes:
  [NS10] Fix a bug where registerIgnoringScore is broken
  [NS09] Implement the new ranking code
 2021-04-01 09:02:15 +00:00
Treehugger Robot
f5ead882f2 Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba am: d68b21d215 am: fe8e0b235f am: 733c4088f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657579

Change-Id: I1488a062c22afff1648dc740f859dbf32db3c1b6
 2021-04-01 08:54:25 +00:00
Chalard Jean
e965720924 Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb
 2021-04-01 08:44:55 +00:00
Jack Yu
6d858e4d0b Merge "Display no data notification in certain scenarios" am: 39e56169aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Ia109fdd98007e1cc6d09fae4b3c09e931e2210e4
 2021-04-01 08:40:56 +00:00
Treehugger Robot
733c4088f0 Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba am: d68b21d215 am: fe8e0b235f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657579

Change-Id: Ia6f614fe65c560681b2f076046a7e4295a3f3e86
 2021-04-01 08:24:14 +00:00
Chalard Jean
7151f51c5a Merge "Fix testLegacyLockdownVpn flaky" 2021-04-01 08:19:53 +00:00
Jack Yu
39e56169aa Merge "Display no data notification in certain scenarios" 2021-04-01 08:11:25 +00:00
Ryan Lin
ada83f2c40 Merge "update switch UI if display magnification request is from external" into sc-dev am: ab9545e869 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13963660

Change-Id: I76116f22510b933683361d52f8867e1d131455fa
 2021-04-01 08:02:14 +00:00
TreeHugger Robot
017791eaeb Merge "Fade in quick settings when shade opens" into sc-dev am: 7a6c103523 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011420

Change-Id: Ia349ad833b5c340fb17859da5235a91deda2d318
 2021-04-01 08:01:59 +00:00
TreeHugger Robot
d331afd096 Merge "PlayerBase: remove dead code for OP_PLAY_AUDIO" into sc-dev am: 424ad85f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054690

Change-Id: I22173a53a2181eacb4fc8451cc49e9d5118914fd
 2021-04-01 08:01:29 +00:00
Chalard Jean
107b967671 Merge "Expose sendNetworkScore that takes a NetworkScore" into sc-dev am: 80ee4a6fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048551

Change-Id: I12aa33414d7e95ab5340e6b1bef3be4e62cfc0e7
 2021-04-01 08:00:30 +00:00
Ryan Lin
ab9545e869 Merge "update switch UI if display magnification request is from external" into sc-dev 2021-04-01 07:51:34 +00:00
Treehugger Robot
fe8e0b235f Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba am: d68b21d215 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657579

Change-Id: I9b85e42a66e310666de6d811e2af38d428a86f3d
 2021-04-01 07:37:36 +00:00
TreeHugger Robot
7a6c103523 Merge "Fade in quick settings when shade opens" into sc-dev 2021-04-01 07:31:34 +00:00
TreeHugger Robot
424ad85f4b Merge "PlayerBase: remove dead code for OP_PLAY_AUDIO" into sc-dev 2021-04-01 07:30:34 +00:00
Chalard Jean
80ee4a6fe2 Merge "Expose sendNetworkScore that takes a NetworkScore" into sc-dev 2021-04-01 07:17:48 +00:00
Christian Frank
4548a03c0e Merge "Improve permission enforcement in SoundTriggerService" into sc-dev am: f07d729ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14055979

Change-Id: Id9befdc043bee50c281e65983f894dd8086064f1
 2021-04-01 06:53:05 +00:00
Tony Huang
2d28bdf1c0 Merge "Fix black screen while pip to split screen" into sc-dev am: c8b7266594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13982586

Change-Id: Ie4445e21e0ecd928fda0a2efc40ac4934fd81f81
 2021-04-01 06:52:34 +00:00
Treehugger Robot
d68b21d215 Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657579

Change-Id: I5b48ef9dd06402401ad806ad28138ee35d222206
 2021-04-01 06:52:16 +00:00
Christian Frank
f07d729ccb Merge "Improve permission enforcement in SoundTriggerService" into sc-dev 2021-04-01 06:48:20 +00:00
Tony Huang
c8b7266594 Merge "Fix black screen while pip to split screen" into sc-dev 2021-04-01 06:35:50 +00:00
Chalard Jean
ea4d25a750 Fix testLegacyLockdownVpn flaky 
When WiFi disconnects, the VPN disconnects immediately. The
broadcast can therefore be sent before the broadcast receiver is
registered, which causes the receiver to not see the broadcast.

The puzzling part is that CONNECTIVITY_ACTION is a sticky
broadcast, so one would expect the broadcast to still be
received, even if the registration is done after the broadcast
is sent. The reason this doesn't happen is that the context used
by the test is a BroadcastInterceptingContext, which does not
treat sticky broadcasts as sticky.

Bug: 184115648
Test: atest --iterations 1000 'ConnectivityServiceTest#testLegacyLockdownVpn'
Change-Id: Ib44c92839d25951cc7d2db0f923e1b104690e1e0
 2021-04-01 06:27:46 +00:00
Winson Chung
9bd83ee894 Merge "More minor menu changes" into sc-dev am: 0aa964394e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054656

Change-Id: Ief93af1f03c312049e9f436e4f613c7d406fcaad
 2021-04-01 06:24:37 +00:00
Winson Chung
0aa964394e Merge "More minor menu changes" into sc-dev 2021-04-01 06:22:11 +00:00
Treehugger Robot
5aac2c84ba Merge "MTP: Add thumbnail generation for JPG" 2021-04-01 06:20:56 +00:00
Winson Chung
915cba9381 Merge "Extend pip dismiss overlay to under cutout" into sc-dev am: 5cd74d3d26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056110

Change-Id: I35c2ab8dddd040a643e1ba9a2c62054ca11af042
 2021-04-01 06:06:55 +00:00
TreeHugger Robot
0f9efd29c5 Merge "Revert "Only display single line for title"" into sc-dev am: 725fd986ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14060808

Change-Id: Ia4969e2fc995f7578b8a8d6721365229468b802b
 2021-04-01 06:06:35 +00:00
Rob Carr
2795f1622e Merge "WindowState: Avoid destroying surface during relayout" into sc-dev am: 4fbc9551ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14037437

Change-Id: Ic5def193f83b232e0b213e303df447569354115f
 2021-04-01 06:06:02 +00:00
TreeHugger Robot
b112738480 Merge "Throw a more helpful exception upon invalid split permission configuration." into sc-dev am: 410bb405b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056765

Change-Id: I4d10bc4ff0c847e7d2a5b762b61fba34c6dae022
 2021-04-01 06:05:16 +00:00
Lyn Han
a5f3ba9a2f Fade in quick settings when shade opens 
Bug: 172289889
Test: locked/unlocked:
      - open shade, qqs fades in
      - close shade, qqs fades out

Change-Id: I5b48a450cc2da6dab8c997c9a6a395d54c2b9067
 2021-04-01 00:42:56 -05:00
Winson Chung
5cd74d3d26 Merge "Extend pip dismiss overlay to under cutout" into sc-dev 2021-04-01 05:42:48 +00:00
TreeHugger Robot
725fd986ff Merge "Revert "Only display single line for title"" into sc-dev 2021-04-01 05:41:10 +00:00
Rob Carr
4fbc9551ae Merge "WindowState: Avoid destroying surface during relayout" into sc-dev 2021-04-01 05:40:31 +00:00
TreeHugger Robot
410bb405b2 Merge "Throw a more helpful exception upon invalid split permission configuration." into sc-dev 2021-04-01 05:37:10 +00:00
Chiachang Wang
fb6d91c9b8 Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e am: 36a95aa83a am: f86bf5259e am: f65792fe22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: I46e9e808b0f3c365a1c54557050cf2f330d551fd
 2021-04-01 05:09:57 +00:00
James Mattis
da225f478c Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: f9cf886d53 am: 2d29ffca41 am: 34b7229ede 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222

Change-Id: I5dcade1fe54a9d1e918796f09f1065893be31ad5
 2021-04-01 05:08:41 +00:00
ryanlwlin
49284c318d update switch UI if display magnification request is from external 
Display magnifier could be magipulated by public API. This request
should be treated as an user interaction. We should also update the
magnification button in such circumstance.

Besides, we also disable display magnification that is requested
by AccessibilityService  when window magnification is enabled.

In the test part, we also verify the shorct trigged in full-screen
mode.

Bug: 179446412
Test: atest MagnificationControllerTest
      manually Test: Use voice access to controll display magnifier
      and chek if switch button is shown.
Change-Id: I729ea6fbf921ba6bd735c62198a2b8caee6ec4d7
 2021-04-01 13:03:48 +08:00
Chiachang Wang
f65792fe22 Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e am: 36a95aa83a am: f86bf5259e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: Ibb523b767c246701d8024f618491c8a125beca18
 2021-04-01 04:51:01 +00:00
James Mattis
34b7229ede Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: f9cf886d53 am: 2d29ffca41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222

Change-Id: Ic7bea025d69f3ea7f6388dfe6a01942cf5ae039d
 2021-04-01 04:50:31 +00:00