Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
690,758 Commits 3 Branches 0 Tags
6e5195e50682a360f524e4e74f69d2ec499a1e22
Commit Graph

690758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Chen
6e5195e506 Merge "[DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845" into sc-v2-dev am: 2f44835733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17304709

Change-Id: Ia88a1af4ba1380900c88f50f1bcbd1ba058205b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:23:20 +00:00
Tom Chen
3fa3b309b1 Merge changes from topic "Smartspace Subcard Logging" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Subcard logging - Media Card code path 2p: a674e1a68e
  [DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845
 2022-03-25 22:04:44 +00:00
Tom Chen
2f44835733 Merge "[DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845" into sc-v2-dev 2022-03-25 22:04:43 +00:00
Eric Biggers
3fc85dafa7 Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f am: 024d224ddd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809

Change-Id: I84e54f8879eda247a3b73875c167203b2725c6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 20:36:59 +00:00
Eric Biggers
024d224ddd Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040809

Change-Id: Ia445a7820ebe9e412797b8b11b4543bb2a08e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 20:14:13 +00:00
TreeHugger Robot
6a3a50a059 Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev am: 24506955d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: Ic5ae3a483055010daa165f8c96a05b79340ea65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 20:07:06 +00:00
Eric Biggers
ca46dc186f Merge "DiskStatsService: stop checking for full-disk encryption" 2022-03-25 19:54:49 +00:00
TreeHugger Robot
24506955d1 Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev 2022-03-25 19:52:44 +00:00
Presubmit Automerger Backend
d2ed307c4d [automerge] RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task 2p: 1060493404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397265

Change-Id: If2c6d7bd66a56a610a2703182f2927759cd4051d
 2022-03-25 18:32:42 +00:00
Ayush Sharma
dccb882c22 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: I5696d3b8559a90400b2b9c2112418bf8d3f96045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:47:06 +00:00
Ming-Shin Lu
1060493404 RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task 
As the new split-screen behavior that the root task of the split-screen
can be in the recents task, so using quick switch can switch between
the split-screen task and other fullscreen tasks.

So if the IME shown on the fullscreen task, when quick switch to
the split-screen task, basically the expected result will be IME
attached on the fullscreen task then won't expect IME moved to the
split-screen task.

However, the issue case is that seen the IME flicker on top of the
split-screen task and then disappeared.

The root case is in DC#computeImeParent didn't consider to not change
the new IME surface parent while the next IME input target has not yet
updated and settled the new IME visiblity, so IME may flicker if
changing the new IME parent too early.
(Typically the IME parent will be on the root displayArea when the
next target task is in multi-window mode)

We do defer changing IME parent from CL[1] when shouldImeAttachedToApp is
true, but this check didn't applied when switching to the split-screen
task, because shouldImeAttachedToApp will be false when the next IME
layering taget is in multi-window mode.

Simply move the above defer update IME parent logic out from
shouldImeAttachedToApp check to fix this IME flicker issue.

Also, remove shouldImeAttachedToApp check in
InsetsPolicy#adjustVisibilityForIme when the window is in insets frozen
state waiting for the next input started. Since there is no strong
reason to froze IME insets only when switching on fullscreen tasks.

[1]: I01b67b9a7fdf04f23ab05c244281f42518352ca5

Fix: 210391817
Test: atest DisplayContentTests#testComputeImeParent_inputTargetNotUpdate
Test: atest WindowStateTests#\
   testAdjustImeInsetsVisibilityWhenSwitchingApps_toAppInMultiWindowMode

Change-Id: I332c0e4fff62df5d7b793eda2767bb58fe85a938
 2022-03-26 01:32:16 +08:00
Ayush Sharma
140e9ba400 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ia6430a6ec27185f33c08cd8120f9fa485370192d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:32:15 +00:00
Ayush Sharma
eba9a7f06e Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: If0707013d26acad6484e8f986d91b7a2a0f2d986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:08:28 +00:00
Lucas Dupin
d55b1074c2 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df am: 996b96f0e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I9446d6890776a0e88eb3550b5b8ce00c3d7de79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:08:24 +00:00
Lucas Dupin
996b96f0e3 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I4f111566fdf2d77602f04525f1e4d7932036e26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:05:11 +00:00
Remi NGUYEN VAN
5312a5ef85 [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours am: fb39ec4221 -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: Ib79c442533914f854dcd75ca82bd155c7c189ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:03:26 +00:00
Remi NGUYEN VAN
abd2ee719d [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours am: db05a43860 -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: I1ff0c31b6f55159e579589604885f6dd12cd08aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:03:24 +00:00
Remi NGUYEN VAN
c8e6f29a28 Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378905

Change-Id: If80b91ea42a838c12f2b21fcf29093b741831566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:02:57 +00:00
Remi NGUYEN VAN
daa61b67ba Move ConnectivityT to packages/modules am: 736d7b55c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378904

Change-Id: I3609f8982a1ebd67e3a5d1234c40a9580a19ce05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:02:49 +00:00
Remi NGUYEN VAN
fb39ec4221 [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: If8bee6f09d8f6c13f40c2457707a2f13086cf005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:02:02 +00:00
Remi NGUYEN VAN
db05a43860 [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: I210b6bf48048fd03452640de18ca8a6c0014a599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:02:01 +00:00
TreeHugger Robot
a5ea5e2d60 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121

Change-Id: I9e396e1d42ca4bce0c19b0eb13942037792c18b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:00:57 +00:00
Matt Pietal
51051d6b20 Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev am: 6fea516344 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378326

Change-Id: Id291f676c0d3089f9fff4e2118c02a40df61da9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 16:59:58 +00:00
Bernardo Rufino
28edb92e7a [automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b693d -s ours 
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5bae2 is already in history

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

Change-Id: I32ac45eed810cedd9a32d4aeca3dc44dcb30e584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 16:58:53 +00:00
Ayush Sharma
65897f0efc Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Idab91471c022a0b2fce1ed765eda0a653eeb88b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 16:51:04 +00:00
Lucas Dupin
9c178778df Merge "Add Hawk to OWNERS 🦅" 2022-03-25 16:26:17 +00:00
Remi NGUYEN VAN
e69e8e903f Merge changes from topic "conn_t_move_aosp" 
* changes:
  Remove stale aidl-export references
  Move ConnectivityT to packages/modules
 2022-03-25 16:25:23 +00:00
TreeHugger Robot
077189a93a Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev-plus-aosp 
* changes:
  [Skip-Merge] [DO NOT MERGE] Do not allow Bluetooth enabling during device 2p: 68ce540e60
  [DO NOT MERGE] Do not allow Bluetooth enabling during device shutting down
  [DO NOT MERGE] Handle SHUTDOWN Intent in BluetoothManagerService
 2022-03-25 16:17:14 +00:00
TreeHugger Robot
97e13dbd32 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev 
* changes:
  [DO NOT MERGE] Do not allow Bluetooth enabling during device shutting down
  [DO NOT MERGE] Handle SHUTDOWN Intent in BluetoothManagerService
 2022-03-25 16:17:13 +00:00
Matt Pietal
6fea516344 Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev 2022-03-25 15:12:06 +00:00
Matt Pietal
5531f47f68 Merge changes from topic "presubmit-am-ea4f4574a23a46d2955c3fdbdc2b1120" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Move onDrawn callback earlier 2p: e2608c01b7
  [DO NOT MERGE] Move onDrawn callback earlier
 2022-03-25 15:12:06 +00:00
Remi NGUYEN VAN
d492a534e2 Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master 
* changes:
  Remove stale aidl-export references
  Move ConnectivityT to packages/modules
 2022-03-25 14:52:26 +00:00
Bernardo Rufino
ed8d74bc2e Merge changes from topic "untrusted-cap" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE 2p: a451d5bae2
  Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE
 2022-03-25 13:55:53 +00:00
Bernardo Rufino
5bc80b693d Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev 2022-03-25 13:55:52 +00:00
Ayush Sharma
40a1fd6bba Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: If3cd2a65495e018a9d9800ba7c9fa52ba49014f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:22:18 +00:00
Ayush Sharma
9f080a0345 Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I22d92503039e830328e6a22a724aeb1286730108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:06:56 +00:00
Ayush Sharma
d06ee6d79d Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ie09dadfc516757cc6237538c55b9a70c9faee9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 13:00:47 +00:00
Ayush Sharma
936c9f03ea Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I440c492f0199a89f61356c21cc0f0be8d0649199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:54:22 +00:00
Ayush Sharma
efb797700e Fix security hole in GateKeeperResponse am: 658c53c47c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: I809144ca234b9cd144b59a4666f75c5b18cc6b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:41:07 +00:00
Ayush Sharma
25356fba35 Fix security hole in GateKeeperResponse am: 5d2176df69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: Iaa20c957e0944a9ce72c1584d93c352d7ffeee40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:35:07 +00:00
TreeHugger Robot
276862cf94 Merge "Use flag to control the restart period value." into sc-v2-dev am: d3e2ea81f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344416

Change-Id: Iaca5fda743044360512e7742522b1f5e94c4b862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 12:34:05 +00:00
TreeHugger Robot
d3e2ea81f2 Merge "Use flag to control the restart period value." into sc-v2-dev 2022-03-25 12:13:19 +00:00
Joanne Chung
e7b4cbc1a1 [automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours 
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history

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

Change-Id: I210ba0fdacd35ae47c02f31311fb48fd7db8ce2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 11:13:58 +00:00
Remi NGUYEN VAN
d386543a34 Remove stale aidl-export references 
As per the TODO, the aidl-export directory was moved to
packages/modules/Connectivity/framework.

Bug: 222234190
Test: TH
Merged-In: I399d2bb259d50916c575e59621ddfaf798affc5c
Change-Id: I5d77a9b0acf8e47c3bed144c735440b5593d7ae1
 2022-03-25 11:07:31 +00:00
Remi NGUYEN VAN
e964543988 Move ConnectivityT to packages/modules 
Delete the files that are moved with history to
packages/modules/Connectivity.

Bug: 222234190
Test: TH
Ignore-AOSP-First: Move with history done per-branch
Merged-In: I399d2bb259d50916c575e59621ddfaf798affc5c
Change-Id: I4ec993d98b084bc73a57131fa632190a050c93cb
 2022-03-25 11:05:20 +00:00
Joanne Chung
c1840b3fd5 Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev 2022-03-25 10:54:51 +00:00
Joanne Chung
a719a69404 Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Trusted Hotword: Allow disabling periodic restarts. 2p: fc651fe0d2
  Trusted Hotword: Allow disabling periodic restarts.
 2022-03-25 10:54:51 +00:00
Cyan_Hsieh
f0b20bb21f [Skip-Merge] [DO NOT MERGE] Do not allow Bluetooth enabling during device 2p: 68ce540e60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121

Bug: 207521630
Change-Id: I29468a3b68ba6869e650981f8f37c68866cdedb3
 2022-03-25 18:07:21 +08:00
Kyunglyul Hyun
716f23d92f Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603

Change-Id: I219e7d25f32e8d469deaa0c68dad16dc89616a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 10:03:27 +00:00
Presubmit Automerger Backend
1b84b233b9 [automerged blank] Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE 2p: a451d5bae2 
Blank merge reason: Change-Id I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 05ebe2894f is in history

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

Bug: 218777508
Change-Id: I0fbdf744c66da97b0799837d04382e224848f7bb
Merged-In: I3a74e1cc43a36171ee10fbf68c4bfff538eee661
 2022-03-25 09:40:15 +00:00