Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,091 Commits 3 Branches 0 Tags
150b41a1474aad2b73130e05018a67abced6fd01
Commit Graph

761091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
150b41a147 Merge "AudioService: fix muteAwaitConnection device check" into tm-dev am: aca0a9e9e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161676

Change-Id: I9033b3918a83e2f0d3f8e5ffdd299194051963e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:19:04 +00:00
Kate Montgomery
e0d552c3e5 Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: I6efeccb77ef905c1567c77ca4b8ea49c9e270b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:18:36 +00:00
Jean-Michel Trivi
aca0a9e9e0 Merge "AudioService: fix muteAwaitConnection device check" into tm-dev 2022-05-04 15:00:52 +00:00
Kate Montgomery
7c4b55cc6c Merge "Revert "Update show system experiment behavior."" into tm-dev 2022-05-04 14:52:56 +00:00
Pablo Gamito
e02a4598d5 Merge "Improve performance of edge extension animation" into tm-dev am: 47aa2ca8aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029144

Change-Id: I06cde9a0f72878c49bce5d114016e7babb5a0bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:13:49 +00:00
Pablo Gamito
47aa2ca8aa Merge "Improve performance of edge extension animation" into tm-dev 2022-05-04 13:07:00 +00:00
Robert Horvath
6427c9d30f Merge "Add test for setLowPowerStandbyActiveDuringMaintenance" into tm-dev am: 363473deab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071390

Change-Id: Ia3b17292ca9181dc483a96686b1d306cc4624aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:06:53 +00:00
Jonathan Scott
543170a235 Merge "Add missing Settings constants." into tm-dev am: ef3ac99de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665790

Change-Id: Ia2a1f48c8569439d408420735e3b196b87b0df6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:06:25 +00:00
Robert Horvath
7d58f8562f Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925

Change-Id: I9d3ebd7fbcd3c3ee71f561020f6b6660f5dba259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:06:08 +00:00
Robert Horvath
363473deab Merge "Add test for setLowPowerStandbyActiveDuringMaintenance" into tm-dev 2022-05-04 12:59:56 +00:00
Jonathan Scott
ef3ac99de6 Merge "Add missing Settings constants." into tm-dev 2022-05-04 12:54:26 +00:00
Robert Horvath
1999fa1097 Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev 
* changes:
  Batch log access requests from same client
  LogAccessDialogActivity improvements
 2022-05-04 12:18:42 +00:00
Edgar Wang
5b8ae2c46f Merge "Add paddinng below "Learn more" link of FooterPrefence" into tm-dev am: 3c2330d3a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18047580

Change-Id: Ia039474675ac286a1f8142ee924c5d4528852ce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:03:41 +00:00
Edgar Wang
3c2330d3a9 Merge "Add paddinng below "Learn more" link of FooterPrefence" into tm-dev 2022-05-04 11:35:56 +00:00
Jiakai Zhang
2211f9a2ee Merge "Check and speed compile System UI on boot." into tm-dev am: 59eb754359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907956

Change-Id: I8b7bd933a4ceadb564bc8785413bb9a0a588e95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 10:52:14 +00:00
Jiakai Zhang
59eb754359 Merge "Check and speed compile System UI on boot." into tm-dev 2022-05-04 10:25:36 +00:00
Vania Desmonda
fa9f19cff0 Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev am: bc99f623d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982482

Change-Id: I0e076da7677c28992da09bd7e3a0f55d90a6a66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 09:57:55 +00:00
Vania Desmonda
bc99f623d4 Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev 2022-05-04 09:43:53 +00:00
Michał Brzeziński
5bc7a1535d Merge "Fixing notifications side margins in large screen portrait" into tm-dev am: f7737d0db9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18142262

Change-Id: Icd8c2316f5d3be0c7e6c96046d6d3c9424861f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 09:01:53 +00:00
Robert Horvath
3bed2ee0bc Merge "Fix re-registering PositionUpdateListener" into tm-dev am: 92d87441e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17957083

Change-Id: I461c6503dca80b7d5255314078e5d6763ecdc04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 09:01:37 +00:00
Joonhun Shin
1c0dcc15c2 Merge "Update Api docs for ProvisioningManager#get[Rcs]ProvisioningStatusForCapability and is[Rcs]ProvisioningRequiredForCapability." into tm-dev am: f1c5479dab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130744

Change-Id: Ic288c2681f69174aaefd7455da1bc8a308b3abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 09:00:11 +00:00
Louis Chang
9d85608c4d Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev am: 6b11b0f83b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18131149

Change-Id: I8897f9313d54d548a343ffa6516d06fd6b94b1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 08:59:18 +00:00
Michał Brzeziński
f7737d0db9 Merge "Fixing notifications side margins in large screen portrait" into tm-dev 2022-05-04 08:48:31 +00:00
Edgar Wang
cfbae0d33a Add paddinng below "Learn more" link of FooterPrefence 
Bug: 198495196
Test: visual
Change-Id: I01ef6c205a92881bbd69a3f879c2a7a563bade55
 2022-05-04 08:36:36 +00:00
Robert Horvath
92d87441e8 Merge "Fix re-registering PositionUpdateListener" into tm-dev 2022-05-04 08:16:43 +00:00
Joonhun Shin
f1c5479dab Merge "Update Api docs for ProvisioningManager#get[Rcs]ProvisioningStatusForCapability and is[Rcs]ProvisioningRequiredForCapability." into tm-dev 2022-05-04 07:47:51 +00:00
Louis Chang
6b11b0f83b Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev 2022-05-04 07:43:57 +00:00
Chris Li
0b5131609f Merge "Don't include PiP activity in app transit" into tm-dev am: 20fc9f1896 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938079

Change-Id: I4b2b433e29adf5326f4ef74a5d482cd724610528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 07:28:51 +00:00
Jean-Michel Trivi
5b65df1bc1 AudioService: fix muteAwaitConnection device check 
Add logs for muteAwaitConnection API calls.
Fix cancel operation by testing device equality with
AudioDeviceAttributes.equalTypeAddress instead of equals as the
device passed by the caller may have just been qualified by
type and address, and may not contain the actual profiles and
descriptors of a connected device.

Bug: 229806548
Test: atest com.google.android.gts.audioservice.AudioServiceHostTest#testMuteAwaitConnection
Change-Id: Id216e6d88859425f9fa49e45843f51ca83ae9b63
 2022-05-04 07:16:06 +00:00
Chris Li
20fc9f1896 Merge "Don't include PiP activity in app transit" into tm-dev 2022-05-04 07:02:50 +00:00
Arthur Hung
7015800dfd Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030448

Change-Id: Id4703ffd794614737bcf523c31ced948b93a90a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 06:33:54 +00:00
Arthur Hung
e880b639cf Merge "Prevent deadlock for clearWaitingDialog" into tm-dev 2022-05-04 06:12:55 +00:00
TreeHugger Robot
5d84697681 Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8eed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821943

Change-Id: I6b9b2ff7bd84ade39b2ec3eb7f161c54a6624329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:52:09 +00:00
Joanne Chung
7031a7817e Merge "Fix Assistant breaks after stopping the app." into tm-dev am: 4c41912939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17651837

Change-Id: I97cfce253d2fe0af725a7e5612fc5cc8a210fe94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:52 +00:00
TreeHugger Robot
969d1b8eed Merge "Fix keyboard is attached to wrong task in split" into tm-dev 2022-05-04 04:22:30 +00:00
Joanne Chung
4c41912939 Merge "Fix Assistant breaks after stopping the app." into tm-dev 2022-05-04 04:08:18 +00:00
Ryan Lin
5901d395d6 Merge "Fix invalid active window if accessibility framework doesn't track windows" into tm-dev am: a7f5aa5be7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17755779

Change-Id: I0a32be9e53d4bcd3134c188c8380acf89ad11c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:32:12 +00:00
Ryan Lin
4db5adedbd Merge "Postpone window_state_changed events until the window is added" into tm-dev am: 857459ff56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741153

Change-Id: I56c240a170970b738fb018e7d7d313cbdd9b43d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:31:59 +00:00
TreeHugger Robot
1930c6b71c Merge "Add tablet-specific version of string" into tm-dev am: 05f0f0926b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152968

Change-Id: I03a560e10aead4da51bede37dbaf6712e20e3954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:31:24 +00:00
Ryan Lin
a7f5aa5be7 Merge "Fix invalid active window if accessibility framework doesn't track windows" into tm-dev 2022-05-04 02:56:26 +00:00
Ryan Lin
857459ff56 Merge "Postpone window_state_changed events until the window is added" into tm-dev 2022-05-04 02:56:16 +00:00
TreeHugger Robot
05f0f0926b Merge "Add tablet-specific version of string" into tm-dev 2022-05-04 02:55:08 +00:00
Chaohui Wang
55336bcbd4 Merge "Add SETTINGS_SLIDER CUJ to InteractionJankMonitor" into tm-dev am: 6474aed2f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938067

Change-Id: I8151127e860a6b5a3d014e06001bdbd47e4885aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:37:53 +00:00
Chaohui Wang
6474aed2f5 Merge "Add SETTINGS_SLIDER CUJ to InteractionJankMonitor" into tm-dev 2022-05-04 02:23:14 +00:00
TreeHugger Robot
00871b04b4 Merge "Revert "Revert "[SettingsProvider] enforce permission on openFile""" into tm-dev am: d42fff5d21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090063

Change-Id: Ie984132366dd4edcdf17f7e3719b4410e0782b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:09:30 +00:00
TreeHugger Robot
d42fff5d21 Merge "Revert "Revert "[SettingsProvider] enforce permission on openFile""" into tm-dev 2022-05-04 01:59:50 +00:00
TreeHugger Robot
9672f74364 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1f732c35cb -s ours am: 1b0fee1631 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1699d3e75447e5f078cb8d6a973ec19e3857e51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:39:16 +00:00
Bill Yi
8755f932f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e10bb52776 -s ours am: f898ac98e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84d58fcf7939b3a6633a4d2bdef90b9a3a4c134c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:39:09 +00:00
TreeHugger Robot
d92931a2be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f84e8a82cc -s ours am: 1f464c8ebc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I390c9378854b337ade84fd84c57f4a129e9c4e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:38:57 +00:00
Bill Yi
1257db159b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c6a6ef034 -s ours am: aac24f6875 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59fb985134e0e562cbea270641a047a314773efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:38:46 +00:00