Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
764,023 Commits 3 Branches 0 Tags
a6d5b4900dda7295eacae6ebecffbe2e200eccba
Commit Graph

764023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
a6d5b4900d Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev am: d4011e0e2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983784

Change-Id: Iae516ef1115fa3410baf353a20cfce48cb82c854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:15:11 +00:00
Eric Laurent
0046e8932c Merge "audio: fix accessibility routing in call" into tm-dev am: 11e5671297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17941425

Change-Id: I0d0a941a9fcbbc113db4bd6709392e32b836d1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:14:47 +00:00
Chris Li
d4011e0e2b Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev 2022-05-03 14:12:54 +00:00
Eric Laurent
11e5671297 Merge "audio: fix accessibility routing in call" into tm-dev 2022-05-03 14:08:33 +00:00
Shaowei Shen
c8887a3c44 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev am: 8292f122d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983949

Change-Id: Ic7487f57f9eb6f9124ed33b66a9f8c38e23e7ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:06:37 +00:00
shaoweishen
df82c24827 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement am: 73706ceebf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983949

Change-Id: I120afd3dfe5a20ff65d3d76f65ddae759b777de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:06:34 +00:00
Shaowei Shen
2c9f8a42eb Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev am: abe29d7362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17859795

Change-Id: I97132d035d2e90acd9a5da32f6b3958b7fe2abbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:06:04 +00:00
shaoweishen
2e56aa3163 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17859795

Change-Id: Ia9c3c0ff6e3b3ff00d7b41c8b3cbc6200722e39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:06:01 +00:00
Beverly Tai
91f0470437 Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev am: d9803be1a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005049

Change-Id: I1daea38d1a8f5f8bc5ce39bec577e616c7d13db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:05:36 +00:00
Beverly
406aaa18bf DO NOT MERGE Update active unlock triggers take #2 am: fe7e9e9a6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005049

Change-Id: I08cb516aef6c6664c9f4e0366632cbcf844163b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:05:33 +00:00
Chris Li
3efad246e2 Merge "Make sure empty TaskFragment notify organizer" into tm-dev am: 597b031cc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18085612

Change-Id: I88bd8666df96fbc0884b8e58fbbbc16c10364a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:04:58 +00:00
Shaowei Shen
8292f122d8 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev 2022-05-03 13:49:43 +00:00
Shaowei Shen
abe29d7362 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev 2022-05-03 13:49:25 +00:00
Beverly Tai
d9803be1a9 Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev 2022-05-03 13:47:36 +00:00
Chris Li
597b031cc5 Merge "Make sure empty TaskFragment notify organizer" into tm-dev 2022-05-03 13:33:54 +00:00
Wesley Wang
99cc1235a0 Merge "Disable battery saver notification based on predicted time left" into tm-dev am: 1d1d37ca68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17984002

Change-Id: I25c7e8f13af2f8f865e68249dbbe8ee1eb90372a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:27:09 +00:00
Justin Weir
9fa399c705 Merge "Ensure log buffers are dumped to file on uncaught exceptions" into tm-dev am: b41c2879b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915248

Change-Id: I2b5ac4f722468b8ba9dfb8a80bc031036ac14698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:26:30 +00:00
Nikita Ioffe
ef2f1e4e52 Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for apk-in-apex" into tm-dev am: 239f082d75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888926

Change-Id: I552d7efb85b903b37ba951ae94e3be1a74539470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:24:16 +00:00
Wesley Wang
1d1d37ca68 Merge "Disable battery saver notification based on predicted time left" into tm-dev 2022-05-03 12:27:37 +00:00
Justin Weir
b41c2879b4 Merge "Ensure log buffers are dumped to file on uncaught exceptions" into tm-dev 2022-05-03 11:38:59 +00:00
Nikita Ioffe
239f082d75 Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for apk-in-apex" into tm-dev 2022-05-03 09:32:41 +00:00
Jim Blackler
61a0ab5713 Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev am: 70853212e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745929

Change-Id: Ic8f1b89c0545205be501ce4b07efc0c4eb0b5309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:17:48 +00:00
Jim Blackler
70853212e7 Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev 2022-05-03 08:48:42 +00:00
Chris Li
c45e1c1ed5 Don't launch placeholder for bottom TaskFragment when waiting for top 
1. When the top TaskFragment just appears, we should treat it as active
   even if it is empty, because we are expecting an activity to be
   launched into it soon. Before that happens, we don't want to launch
   placeholder for the activity behind.
2. When a TaskFragment is appeared as empty, set a timeout to remove it
   instead of waiting forever in case the activtiy start failed.

Fix: 230540531
Bug: 219683160
Test: atest WMJetpackUnitTests:SplitControllerTest
Test: atest WMJetpackUnitTests:TaskFragmentContainerTest
Change-Id: Ie05e379bf898b67912a849ad84f9fe7708e289c6
 2022-05-03 15:24:33 +08:00
Philip Quinn
bf3a33538d Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90abc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130643

Change-Id: Ib337d6a43e9ef34800d5bbb7706c73eb022fb7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:18:36 +00:00
Jernej Virag
1ec9e808cc Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090282

Change-Id: I76ad5f3427e3438f6fad238c92ddfb48c03d58db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:18:17 +00:00
Riddle Hsu
940cea36a6 Merge "Toggle orientation sensor outside of WM lock" into tm-dev am: 89e92e9bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18027823

Change-Id: I662855bace8353b081f533f961ee5561dbf936cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:17:50 +00:00
Charles Chen
c105b1d8f8 Merge "Update SplitContainer for non-finishing containers" into tm-dev am: 9040b7e261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030508

Change-Id: I72416ce42aa5f0165261b66b2aec23fffd0ea96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:17:25 +00:00
Philip Quinn
9f16382e08 Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev am: e536aa4f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130632

Change-Id: I7cc94863c2cacfef0c5622901207645413c37d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:16:55 +00:00
Philip Quinn
ec77a90abc Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev 2022-05-03 07:14:08 +00:00
Jernej Virag
cfbbd755ff Merge "Trace Window relayout reasons" into tm-dev 2022-05-03 06:45:30 +00:00
Riddle Hsu
89e92e9bd0 Merge "Toggle orientation sensor outside of WM lock" into tm-dev 2022-05-03 06:37:44 +00:00
Charles Chen
9040b7e261 Merge "Update SplitContainer for non-finishing containers" into tm-dev 2022-05-03 06:37:26 +00:00
Philip Quinn
e536aa4f9e Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev 2022-05-03 06:36:02 +00:00
Chris Li
9ebaba818d Make sure empty TaskFragment notify organizer 
Before, we only notify organizer for empty TaskFragment when either the
Task is empty or the last activity in the TaskFragment is reparented to
PIP task.

However, there can also be cases where the last activity in a
TaskFragment is finished in background. We also want to give it a chance
to remove the TaskFragment.

Bug: 225371112
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: Id679524a48a0693f15334f98058aaaf4caac52d2
 2022-05-03 05:57:22 +00:00
TreeHugger Robot
f694ac06a3 Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev am: a683c1ba94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18124902

Change-Id: Ieeb67dffba1240270a31a3a83d419ee5d35185b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:10:27 +00:00
TreeHugger Robot
88eb7205c5 Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c95416 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17954103

Change-Id: I9cbf00179502f72579ce5acddf96f46fa9671c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:10:02 +00:00
TreeHugger Robot
ca100c4d96 Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956048

Change-Id: Ibfc17761e13cb213c7e08403a1b106429fd9a09b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:09:42 +00:00
Lucas Dupin
20d4a1df01 Merge "Avoid Spell Checker initialization during anim" into tm-dev am: ae0a72f3c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18128982

Change-Id: Ia9cd986250eecba031d9316272243a0bfa30fa68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:08:37 +00:00
TreeHugger Robot
b6da4a3762 Merge "Add some extra exception catching/logging to readxml" into tm-dev am: 2ca31b10ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18094505

Change-Id: Ib9e513cf1c5e8eddfd6f22fbcc5016d5e3cd2e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:08:13 +00:00
Rhed Jao
6232825912 Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988068

Change-Id: If43dead287a257960909b380a4285856ab0fd7f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:05:36 +00:00
shaoweishen
73706ceebf DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement 
Use Lock when access MediaDevices in MediaOutputController as in
LocalMediaController, prevent devices changed while refreshing.
Sort devices in Controller to make sure the sequence is correct.
Add grouping state to make dynamic grouping has transition state.

Bug: 228511134
Bug: 228255441
Test: N/A
Change-Id: I4976176f3133e48c41a56d746861a9a4027f9a34
 2022-05-03 04:53:36 +00:00
shaoweishen
de900861e9 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected 
Bug: 203074066
Test: Verified on device
Change-Id: Ib40bb575796d077d7fcf89d510087e4fcb0bc00b
 2022-05-03 04:41:30 +00:00
TreeHugger Robot
a683c1ba94 Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev 2022-05-03 04:00:56 +00:00
TreeHugger Robot
a776c95416 Merge "ColorSchemeTransition now updates the ripple color" into tm-dev 2022-05-03 03:46:07 +00:00
TreeHugger Robot
ae7d1beb80 Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev 2022-05-03 03:28:30 +00:00
Lucas Dupin
ae0a72f3c7 Merge "Avoid Spell Checker initialization during anim" into tm-dev 2022-05-03 03:10:10 +00:00
TreeHugger Robot
2ca31b10ab Merge "Add some extra exception catching/logging to readxml" into tm-dev 2022-05-03 02:50:17 +00:00
Rhed Jao
a22156f40d Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev 2022-05-03 02:45:20 +00:00
TreeHugger Robot
cb901abea5 Merge "Fix ManualBenchmarkState iteration unit" into tm-dev am: 1c51fb46b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097689

Change-Id: I06befedc900978aa76319b8cec52e2cccd07dcc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:42 +00:00