Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
757,741 Commits 3 Branches 0 Tags
27cd4eaa56d91c7bd5938da466c376ea59f66cf1
Commit Graph

757741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
27cd4eaa56 Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev am: 721634a9ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17696010

Change-Id: Id7f1412adb8789a839703421c4c42e052664644d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:43:06 +00:00
Chris Li
721634a9ec Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev 2022-04-12 12:37:16 +00:00
TreeHugger Robot
78a97c8dcc Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev am: ab0c667365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16973066

Change-Id: Ib22e05f5e64dbbd9e58da287947c67e1d23db8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:36:35 +00:00
TreeHugger Robot
ab0c667365 Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev 2022-04-12 12:21:47 +00:00
Jing Ji
5c28c0a01b Merge "Update the text of background app battery usage notification." into tm-dev am: 885af3d522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697827

Change-Id: I199e56cf08e4d1acdd3bf6d105a47a5779d7bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:45:54 +00:00
Jing Ji
885af3d522 Merge "Update the text of background app battery usage notification." into tm-dev 2022-04-12 11:29:28 +00:00
Julia Reynolds
4b3debf652 Merge "Modify handling of notifs with invalid sounds" into tm-dev am: 08f603903c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665297

Change-Id: I562e1ecba2dcbeefacce87345fc554cd0316dda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:17:57 +00:00
Julia Reynolds
08f603903c Merge "Modify handling of notifs with invalid sounds" into tm-dev 2022-04-12 11:02:03 +00:00
Michał Brzeziński
5416b91312 Merge "Moving brightness slider lower in split shade" into tm-dev am: cd2ba60978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619728

Change-Id: Ie2d84fd566c615ae1d9088f40810a4d45eaff16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:32:12 +00:00
Michał Brzeziński
cd2ba60978 Merge "Moving brightness slider lower in split shade" into tm-dev 2022-04-12 10:15:23 +00:00
TreeHugger Robot
4fd0ff86b2 Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev am: 217edfa93b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518065

Change-Id: I38613dcb05df4eb4a7e6d04816b9a1e8a08ab127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:10:09 +00:00
TreeHugger Robot
217edfa93b Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev 2022-04-12 09:49:49 +00:00
Cliff Wu
3895dba947 Fixed that the camera will not be blocked on the virtual display in special cases 
- Root cause: When an app uses the system default camera app to open
the camera on the phone, and another app uses an Intent
(MediaStore.ACTION_IMAGE_CAPTURE) (the system default camera app) to
open the camera on the virtual display, because they will use the same
thread in the camera service, the camera will only reconfigure the
stream without creating it again. Therefore, the onCameraOpened callback
will not be triggered, causing the issue that the camera on the virtual
display is not blocked.

- Solution: The camera mechanism is that only one camera can run at a
  time. If two apps open the camera at the same time, it will first open
  and close the camera of one of two apps, and then open the camera of
  another app. So we identify above issue according to this rule: track
  the app that opens the camera on the phone (main display). When it is
  detected that this app also appears on the virtual display, it means
  that the app appears on both sides at the same time, which belongs to
  the above issue, and the camera of this app is set to a blocked state.

Bug: 210795569
Test: Manual
Change-Id: Idabee8a38085c8aae1f47f3579cead1adde385ea
 2022-04-12 09:24:44 +00:00
Jacqueline Bronger
809566f868 Merge "Fix gravity after re-enabling expanded PiP" into tm-dev am: 6cc02e8d74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570468

Change-Id: I594badff029a4a1d7bacd58dac4b4bce7970aa41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 08:53:49 +00:00
Galia Peycheva
536be689bf Merge "Fix strange pip size in horizontal expanded mode" into tm-dev am: 427189714d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607768

Change-Id: I979c87012da1969226f31655fbebd86f9ee3759e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 08:53:18 +00:00
Jacqueline Bronger
6cc02e8d74 Merge "Fix gravity after re-enabling expanded PiP" into tm-dev 2022-04-12 08:48:52 +00:00
Galia Peycheva
427189714d Merge "Fix strange pip size in horizontal expanded mode" into tm-dev 2022-04-12 08:29:43 +00:00
Tiger Huang
84d46c3191 Merge "Fix WindowInsets#getStableInsets" into tm-dev am: 06b93cf997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17691529

Change-Id: I45910236eed6ada2641d1fe2662e29a926baf848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 06:30:51 +00:00
Chris Li
c48483db9e Fix untrusted embedding visibility in multi windowing mode 
Before, we search overlay within the same root Task, which can be other
task in split. Now, we only search within the same leaf Task.

Bug: 197364677
Test: atest WmTests:TaskFragmentTest
Change-Id: I64dfdf322a15cfd80f169d0ddfc6e9bbf94d2a03
 2022-04-12 14:25:41 +08:00
Tiger Huang
06b93cf997 Merge "Fix WindowInsets#getStableInsets" into tm-dev 2022-04-12 06:09:03 +00:00
Riddle Hsu
4ddec89fa6 Merge "Do not show animation background with wallpaper transition" into tm-dev am: dc19fc3bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665554

Change-Id: I22f68f6eb7f1e05d0efda991fbdb11baadb14c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:47:02 +00:00
Shaowei Shen
10e98e106d Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev am: eda5ea3e38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686878

Change-Id: I1040e7cf013821706ca205d78aebdc833264b221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:46:44 +00:00
shaoweishen
4b4504dd4b DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control am: 11a776a908 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686878

Change-Id: I066658eb39d39eac33846d99a1e6f92d7e3287f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:46:43 +00:00
Riddle Hsu
dc19fc3bd0 Merge "Do not show animation background with wallpaper transition" into tm-dev 2022-04-12 05:45:11 +00:00
Shaowei Shen
eda5ea3e38 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control" into tm-dev 2022-04-12 05:42:21 +00:00
TreeHugger Robot
78d126687a Merge "Post the starting of the Notification dialog" into tm-dev am: 466dcdd650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650398

Change-Id: I433608a5a65fe2d1260276d628c2fc4d9d56dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:31:25 +00:00
TreeHugger Robot
466dcdd650 Merge "Post the starting of the Notification dialog" into tm-dev 2022-04-12 05:27:34 +00:00
TreeHugger Robot
37517a3990 Merge "Add config to disable Bubbles" into tm-dev am: d421a51399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665269

Change-Id: I18cd310c28294680b8aae8416449de704f88f88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:24:30 +00:00
TreeHugger Robot
d421a51399 Merge "Add config to disable Bubbles" into tm-dev 2022-04-12 04:57:50 +00:00
Chris Li
8ebb15f51e Merge "No embed activity when Task is in PIP" into tm-dev am: a6b968f887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665556

Change-Id: I23b50a3b749c8d6fd4e6395df5b3a35f0c32522b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 03:55:55 +00:00
Chris Li
a6b968f887 Merge "No embed activity when Task is in PIP" into tm-dev 2022-04-12 03:29:37 +00:00
Shawn Lin
d26a311a69 [automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours am: 08cc104906 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c86cfae490ec56a8a9881e550573cc8fbb017ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:23 +00:00
Shawn Lin
506cf504ac Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28 am: 24eb4b556e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Id2d8ffd7dbc979ca835a459443e7673b2d9e4ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:11 +00:00
shawnlin
451cdb1e19 [automerger skipped] [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c am: 1f5b53c8c4 -s ours am: 5972c1d457 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13cd8247cf3e6a4c13b05d77b5ae8721122a0090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:04 +00:00
Arthur Hung
705da0a314 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev am: 92f53fc942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635306

Change-Id: Ib4927f9b47617cfaf6554a0c8e2cad398cca44b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:37:40 +00:00
TreeHugger Robot
67b062cdf1 Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev am: a5e6d1e6b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694571

Change-Id: Iee7a83c6de6e097bf8018c776a2009afb731a58f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:37:23 +00:00
Shawn Lin
08cc104906 [automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1135c619f99128432615ee68ce70ab1960aee0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:57 +00:00
Shawn Lin
35ebe0d719 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev am: 455e78d8f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17534146

Change-Id: I3d2c5293fada798ea1a4b1f5a6231c5c70b1d704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:53 +00:00
Shawn Lin
24eb4b556e Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ibf65c7b92a7721aa1ab3cd4a68cab05ef9981142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:36:09 +00:00
shawnlin
5972c1d457 [automerger skipped] [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c am: 1f5b53c8c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I639e5baa4da709a5347ebd035e5c3fece16b6927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:35:46 +00:00
Shawn Lin
c0d749ed90 Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875

Change-Id: Ia35e5f69b5f363b61a208b9dc949cb383c68574f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:35:45 +00:00
Arthur Hung
92f53fc942 Merge "Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode" into tm-dev 2022-04-12 02:34:17 +00:00
TreeHugger Robot
a5e6d1e6b3 Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev 2022-04-12 02:17:45 +00:00
Shawn Lin
455e78d8f4 Merge "Fixed status bar glitch for apps that access internal res" into tm-dev 2022-04-12 02:15:58 +00:00
Shawn Lin
7337802a28 Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c
  [DO NOT MERGE] Update to use new res status bar height dimen
 2022-04-12 02:14:40 +00:00
Shawn Lin
2f5827830e Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev 2022-04-12 02:14:40 +00:00
Minche Li
6724a50761 Merge "Notifies magnification change for the transitioning target mode" into tm-dev am: b26d2ae80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040106

Change-Id: I78e8f2f5ce587da1dd6359ae84f4acf9212bf68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 01:29:27 +00:00
Minche Li
b26d2ae80b Merge "Notifies magnification change for the transitioning target mode" into tm-dev 2022-04-12 01:10:41 +00:00
Shaowei Shen
3add1e63d4 Merge "[Output switcher] Check current device" into tm-dev am: 49ab839806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17608150

Change-Id: I91b75694e9a8d4cde702bc0ebcd2ea62c451c6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 01:00:32 +00:00
Shaowei Shen
49ab839806 Merge "[Output switcher] Check current device" into tm-dev 2022-04-12 00:14:37 +00:00