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

638875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Riddle Hsu
8892ec3892 Merge "Set wallpaper to invisible only if it is not visible-requested" into sc-dev am: 5b605bb1bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048552

Change-Id: Idb6f9e5f9b4221e8da4a269845f9b2cebd9e42fa
 2021-04-01 04:47:18 +00:00
Alexander Dorokhine
6a566a6ecb Merge "Update framework from jetpack." into sc-dev am: 2acbf30842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14058265

Change-Id: I02ef56dde4b92587363712511e2853e35efc590e
 2021-04-01 04:46:53 +00:00
Riddle Hsu
5b605bb1bc Merge "Set wallpaper to invisible only if it is not visible-requested" into sc-dev 2021-04-01 04:34:49 +00:00
Alexander Dorokhine
2acbf30842 Merge "Update framework from jetpack." into sc-dev 2021-04-01 04:33:36 +00:00
Rhed Jao
49e98eb569 Merge "Using internal user manager for the lock state checking" into sc-dev am: e3f114e779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048287

Change-Id: If7b155d1458f751ccefe0dbee808303f34852cf3
 2021-04-01 04:16:59 +00:00
TreeHugger Robot
fb9c11c740 Merge "Fix MediaTrancodeManager session priority" into sc-dev am: 1431702c5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057264

Change-Id: I6d38c4fafc5e6412f67bc3abf607bf0da97b7a1d
 2021-04-01 04:16:07 +00:00
Rhed Jao
e3f114e779 Merge "Using internal user manager for the lock state checking" into sc-dev 2021-04-01 04:15:56 +00:00
Tsung-Mao Fang
1f32d90da0 Revert "Only display single line for title" 
This reverts commit 2973c423b2.

Reason for revert: Some use cases don't need single line design. see b/184108687
Fix: 184108687

Change-Id: Ifa33218fc4dca8fff1875700b254d737fb5a024a
 2021-04-01 04:13:55 +00:00
TreeHugger Robot
1431702c5e Merge "Fix MediaTrancodeManager session priority" into sc-dev 2021-04-01 04:02:49 +00:00
Chiachang Wang
f86bf5259e Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e am: 36a95aa83a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: I644bfe6309efb657e7ffd94445d3b26427f0c594
 2021-04-01 04:00:33 +00:00
Winson Chung
07dfa906e5 Merge "Expose the full task info with the remote animation target" into sc-dev am: db41d72646 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13952466

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

Change-Id: Id0258e1a468f4b33141f45420913d3276764b04e
 2021-04-01 03:57:46 +00:00
Winson Chung
db41d72646 Merge "Expose the full task info with the remote animation target" into sc-dev 2021-04-01 03:56:55 +00:00
Wesley Wang
a4b1b6e69e Merge "Update battery settings relative strings (1/3)" into sc-dev am: 3500d17499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048288

Change-Id: Idb28e18c184f271c73452419d46be7e3323ff3e1
 2021-04-01 03:56:41 +00:00
Wesley Wang
3500d17499 Merge "Update battery settings relative strings (1/3)" into sc-dev 2021-04-01 03:38:37 +00:00
Saho Kobayashi
4859e4f947 Merge "Correctly handle TargetAccessibilityFocus flag" into sc-dev am: f80bd0f769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911312

Change-Id: I3646b7b9c32cff7a3c8575dcf991332519a77dac
 2021-04-01 03:38:19 +00:00
Jimmy Chen
039b5bda88 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: 62e79738c3 am: 5fe022de71 am: cfb4fa83d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: I83f96d43087430fd4b1194218af3925ed0004574
 2021-04-01 03:38:08 +00:00
Jimmy Chen
20ed9de315 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6 am: 4f1799e6c8 am: ad9eed435a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I3e8e0bc02f88f7b366657a57f7520dc5d2ba7132
 2021-04-01 03:37:58 +00:00
Jimmy Chen
2d00aa59ff Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: cd05cf4aa7 am: 0eec50702d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: Ibbecedaa762e3db8231ffcc77949a477c98cdc5a
 2021-04-01 03:37:42 +00:00
Saho Kobayashi
f80bd0f769 Merge "Correctly handle TargetAccessibilityFocus flag" into sc-dev 2021-04-01 03:36:48 +00:00
Jimmy Chen
cfb4fa83d2 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: 62e79738c3 am: 5fe022de71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: Ie12735372b459014c288c9b3e048b1bfe05754f6
 2021-04-01 03:20:11 +00:00
Jimmy Chen
ad9eed435a Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6 am: 4f1799e6c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I2ca33f91ce7dd7aa7b293e4d9e2d38177e0e9dfb
 2021-04-01 03:19:47 +00:00
Chiachang Wang
36a95aa83a Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: Ie6f855ec7fd19a565344b817a60abdc5263a2cfa
 2021-04-01 03:19:33 +00:00
Jimmy Chen
0eec50702d Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: cd05cf4aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: I9cd1a445d4758ef2c0bef72ebbce92d202462961
 2021-04-01 03:18:27 +00:00
James Mattis
f9cf886d53 Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222

Change-Id: Iec83a93593e52cdb2baf12fa76c70af9df263ee4
 2021-04-01 03:15:42 +00:00
Chiachang Wang
4f62a89c9e Merge "Add required permission to FrameworksNetIntegrationTests" 2021-04-01 03:15:07 +00:00
Ryan Mitchell
4e1e356758 Merge "Fix aapt2 feature split package name generation" into sc-dev am: 936b515714 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14035668

Change-Id: Ie23323ce7133e002c9b897fa787a3f06b42c93a9
 2021-04-01 03:14:30 +00:00
Ryan Mitchell
936b515714 Merge "Fix aapt2 feature split package name generation" into sc-dev 2021-04-01 03:00:54 +00:00
Remi NGUYEN VAN
8003fdc743 Merge "Add framework-connectivity-test-defaults" into sc-dev am: f8365783ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14029485

Change-Id: Ia76c84216aef7a830a4e105b21711f1186a037a9
 2021-04-01 02:54:40 +00:00
Remi NGUYEN VAN
f8365783ff Merge "Add framework-connectivity-test-defaults" into sc-dev 2021-04-01 02:43:26 +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
James Mattis
6269d2eb7a Merge "Calling linkToDeath on binder in NRI constructor" 2021-04-01 02:38:58 +00:00
Vadim Tryshev
7e58dae033 Merge "Revert "Enable new ripple"" into sc-dev am: f2ab932abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054280

Change-Id: I60c37c9d61d60c854b465389aa975a58a286b1de
 2021-04-01 02:38:33 +00:00
TreeHugger Robot
f149e345a8 Merge "Disable overscroll" into sc-dev am: 82cb4c5dc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022328

Change-Id: I62a1ba6af57b86231660448a903ace336074d585
 2021-04-01 02:38:00 +00:00
Bill Lin
aa83cc4fe8 Merge "1/ Make One handed mode support multiple user switch" into sc-dev am: f9d740b0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13851605

Change-Id: I855e7ece30235a85b82a5903bee6d2f9d0ebac02
 2021-04-01 02:37:25 +00:00
TreeHugger Robot
66460cb97d Merge "Allow to report finsh/pause state if Activity isn't resume." into sc-dev am: c5547caafb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14031651

Change-Id: I2b75ec475bb8a2b0eb86a885e859633858112f80
 2021-04-01 02:36:03 +00:00
Jimmy Chen
5fe022de71 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1 am: 62e79738c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717

Change-Id: Ib1525a770c4f174e12b5d31c527279201019ada4
 2021-04-01 02:35:40 +00:00
Jimmy Chen
62e79738c3 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: I38dca494da96afdf2932c94914ba6fce412f308e
 2021-04-01 02:35:27 +00:00
Jimmy Chen
4f1799e6c8 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I128bd35ad9dea6d9085f746790af2c1bc2344b47
 2021-04-01 02:35:18 +00:00
Vadim Tryshev
f2ab932abf Merge "Revert "Enable new ripple"" into sc-dev 2021-04-01 02:26:37 +00:00