Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,877 Commits 3 Branches 0 Tags
61e53b6caecf6e1fb032a58a7eb30da890977ae5
Commit Graph

760877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Kozynski
61e53b6cae Merge "Don't crash TileService app when systemui crashes" into tm-dev am: 4ae15e81bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694868

Change-Id: I1a1f4e3c5b0144a23f74418b862fc9895e462adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 13:34:43 +00:00
Fabian Kozynski
4ae15e81bc Merge "Don't crash TileService app when systemui crashes" into tm-dev 2022-04-12 13:16:54 +00:00
Jorim Jaggi
7e9cd5cfd3 Merge "Fix doc issue linking internal class" into tm-dev am: 331f163d20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693836

Change-Id: I2781fe1faccbbc2fd8af4cf413a85aaf8969a628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:58:16 +00:00
Jorim Jaggi
331f163d20 Merge "Fix doc issue linking internal class" into tm-dev 2022-04-12 12:50:54 +00:00
Chris Li
930a71f530 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: If1ef0b1c821b40e05a104782776d446363900adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:42:18 +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
1ba934161e 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: I4b8f23e428728cd1e18a46ab86a7995871bfe21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:35: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
TreeHugger Robot
a579290159 Merge changes from topic "presubmit-am-32698aa12e6f46839a1d4707427a6868" into tm-mainline-prod 
* changes:
  [automerge] Fixed that the camera will not be blocked on the virtual display in special cases 2p: 3895dba947
  Fixed that the camera will not be blocked on the virtual display in special cases
 2022-04-12 12:21:47 +00:00
Jing Ji
e0f22a06a7 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: I5494c8da36725707253c306314347c053a00c2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:45:19 +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
Jing Ji
7c0c83edb2 Merge changes from topic "presubmit-am-b6516f7bf55346dda9194c8d19120348" into tm-mainline-prod 
* changes:
  [automerge] Update the text of background app battery usage notification. 2p: 7571d317b7
  Update the text of background app battery usage notification.
 2022-04-12 11:29:27 +00:00
Julia Reynolds
c6890ca2eb 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: I5dbeb5b7a924ebdd0e62ea341ae993e723a0a670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:16:45 +00:00
Julia Reynolds
08f603903c Merge "Modify handling of notifs with invalid sounds" into tm-dev 2022-04-12 11:02:03 +00:00
Julia Reynolds
171d84389f Merge changes from topic "presubmit-am-1a5e8be9647b40b7903a5d55661acee3" into tm-mainline-prod 
* changes:
  [automerge] Modify handling of notifs with invalid sounds 2p: 2210ff10e3
  Modify handling of notifs with invalid sounds
 2022-04-12 11:02:03 +00:00
Michał Brzeziński
d80bfd1ef2 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: I5526a579b4623c824d7c1ebc0dc26f5427c781f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:31:32 +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
Michał Brzeziński
feb07a6905 Merge changes from topic "presubmit-am-0141ebd6919d4431b91f43ddd2fbf1d8" into tm-mainline-prod 
* changes:
  [automerge] Moving brightness slider lower in split shade 2p: 2cf1a16cb5
  Moving brightness slider lower in split shade
 2022-04-12 10:15:23 +00:00
TreeHugger Robot
510a370868 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: I350ca5441d2f1e761f9de40f4c0d6a09aab769eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:09:07 +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
TreeHugger Robot
9f65bccfd1 Merge changes from topic "ons-sim-port" into tm-mainline-prod 
* changes:
  [automerge] SIM slot not available error code added to UpdateAvailableNetworksResult 2p: 4db56098fc
  SIM slot not available error code added to UpdateAvailableNetworksResult
 2022-04-12 09:49:48 +00:00
Presubmit Automerger Backend
30cecc85a0 [automerge] Fixed that the camera will not be blocked on the virtual display in special cases 2p: 3895dba947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16973066

Bug: 210795569
Change-Id: I4a80cf1b6dedacf71eee398e525d951975863200
 2022-04-12 09:25:09 +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
6cc2346231 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: I5c20a8bac06ff959121e13b3f829ec769b62b68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 08:53:05 +00:00
Galia Peycheva
8ba5cf630e 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: I03dd4aa88a253356e262deae1cdcce6aecafa29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 08:52:22 +00:00
Jacqueline Bronger
6cc02e8d74 Merge "Fix gravity after re-enabling expanded PiP" into tm-dev 2022-04-12 08:48:52 +00:00
Jacqueline Bronger
d2f4d58c84 Merge changes from topic "presubmit-am-bace65c5abc044d19d4290071ec1a4e0" into tm-mainline-prod 
* changes:
  [automerge] Fix gravity after re-enabling expanded PiP 2p: 7d23b1c624
  Fix gravity after re-enabling expanded PiP
 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
Galia Peycheva
7d33729d70 Merge changes from topic "presubmit-am-ea374dd0fc9847428966bc496256e6cf" into tm-mainline-prod 
* changes:
  [automerge] Fix strange pip size in horizontal expanded mode 2p: 413044b7de
  Fix strange pip size in horizontal expanded mode
 2022-04-12 08:29:42 +00:00
Tiger Huang
201f94fee6 Merge "Fix WindowInsets#getStableInsets" into tm-dev am: 06b93cf997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17691529

Change-Id: Ie6698bca95ca35ac207ecfc69cbc5b61b58f9c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 06:29:49 +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
ca20903681 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: I467743855218d81827033e4677a64dab4a158fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:47:04 +00:00
Shaowei Shen
799d807420 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: I6e638113ef14b9fe827667cb0e67a54ae7232600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:46:34 +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
TreeHugger Robot
26f2b2a93a 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: Ifd3fb93edbfaea5374496eb336057fae25c63378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:45:00 +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
Shaowei Shen
f436c0519c Merge changes from topic "presubmit-am-564566ba5b6d4ddbb308aff0c5330d99" into tm-mainline-prod 
* changes:
  [automerge] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control 2p: 11a776a908
  DO NOT MERGE: Downbranch merge conflict [Output Switcher] Refine seekbar control
 2022-04-12 05:42:21 +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
b1116d3df9 Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into tm-mainline-prod 
* changes:
  [automerge] Post the starting of the Notification dialog 2p: a866e54d14
  Post the starting of the Notification dialog
 2022-04-12 05:27:34 +00:00
TreeHugger Robot
1af3c20c6e 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: I816327624e11c8e48afacdbdf6d7f6b10d1f2c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 05:23:42 +00:00
TreeHugger Robot
d421a51399 Merge "Add config to disable Bubbles" into tm-dev 2022-04-12 04:57:50 +00:00
Chris Li
a3535946bc 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: Ibb15fca0bec721ea53f92df4faf4bd4b36ebe99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 03:54:57 +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
Chris Li
6655eef987 Merge changes from topic "presubmit-am-ea582a154fef4cbc9b57e3c967f1016b" into tm-mainline-prod 
* changes:
  [automerge] No embed activity when Task is in PIP 2p: c3b209094c
  No embed activity when Task is in PIP
 2022-04-12 03:29:37 +00:00
Shawn Lin
f61be2358f [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: I11fca060847b42e016b11d59e83d6ec55eb49133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:40:08 +00:00
Shawn Lin
d6b87e3ab0 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: I4c926df01f54f3cdb92a3cc983a504be433f9ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:39:51 +00:00
shawnlin
4703cc91ef [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: I65112997307e791d6cf96b70f044ca1cfe322be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:39:43 +00:00
Arthur Hung
647340d139 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: I81c49b10b0ceb57eb73a1edd3fd05739e921c301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:38:45 +00:00
TreeHugger Robot
290abbd37a 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: I5ac37a4d012dcd465f06c9d0932c9a0225a98746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 02:37:49 +00:00