Raphael Kim
59bf8d32d4
Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev am: 99945d5d70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175782
Change-Id: I7fb6c9211eac542be564828e11f1e0da457502c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 00:23:53 +00:00
Raphael Kim
99945d5d70
Merge "Implement dumpsys for CompanionDeviceManagerService.CompanionDeviceManagerImpl" into tm-dev
2022-06-01 00:03:42 +00:00
TreeHugger Robot
1c72433780
Merge "Fix "NetworkCallback was not registered" crash" into tm-dev am: 92538a9dbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18619553
Change-Id: Ie4e38a936928c17759b61a84fc3c4263e2ad232e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 22:38:24 +00:00
TreeHugger Robot
92538a9dbc
Merge "Fix "NetworkCallback was not registered" crash" into tm-dev
2022-05-31 22:16:47 +00:00
Hongwei Wang
7afb10d48d
Merge "Validate content overlay before removal" into tm-dev am: eb700c0090
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18656364
Change-Id: I8d84242efab45782b491579ea4fd94a9003f067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 19:49:50 +00:00
Hongwei Wang
eb700c0090
Merge "Validate content overlay before removal" into tm-dev
2022-05-31 19:24:48 +00:00
Anton Hansson
d7454f1430
Merge "Use already compiled library" am: f347ef66de am: b868a560bf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110245
Change-Id: I0a3637ec5124e14165f3ee62f1a9d2c65e9c7c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 18:44:16 +00:00
Anton Hansson
b868a560bf
Merge "Use already compiled library" am: f347ef66de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110245
Change-Id: I7c3588b9aab8fef67807195243a04b85494a29c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 18:15:56 +00:00
Anton Hansson
f347ef66de
Merge "Use already compiled library"
2022-05-31 17:58:54 +00:00
Sorin Basca
440f6f3b0a
[automerger skipped] Merge "Bump supported source version." am: ac8e1f6cf3 am: 58949079aa -s ours
...
am skip reason: Merged-In Iaeb054d2faee8ff204b0d5477ebe062ec4aa1afd with SHA-1 bc65d6e4fe is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2111044
Change-Id: I4e49e81fd265fad5d625048e03e4cfce5f292bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 16:56:03 +00:00
Chavi Weingarten
913bec9fc9
Merge "Toast: Fix JE caused by service not bind" am: ddf2f52d9f am: 3f03d5851a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092527
Change-Id: If538bc07c63d76c8576159e23610500ff47eb754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 16:55:27 +00:00
Sorin Basca
58949079aa
Merge "Bump supported source version." am: ac8e1f6cf3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2111044
Change-Id: I7edf1415530db84f018d3b4b8fc109c989d18c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 16:04:30 +00:00
Chavi Weingarten
3f03d5851a
Merge "Toast: Fix JE caused by service not bind" am: ddf2f52d9f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092527
Change-Id: I5336d3ac2e151d04808b5ac1f866d02e9497e0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 16:02:55 +00:00
Issei Suzuki
6b153ac88f
Merge "Exclude launcher from app transition animation while recents is running." into tm-dev am: 0dfb582d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492309
Change-Id: I1ba97266f5d74eab58b14376bbf573dcce33d740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 15:53:31 +00:00
Jing Ji
0db987a301
Merge "Add component types which a process is hosting into the proc memstats" into tm-dev am: 57e03f3b30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18613527
Change-Id: Ided2918b851537908ccc066eb7ccb4b2caa11893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 15:53:05 +00:00
Issei Suzuki
0dfb582d5a
Merge "Exclude launcher from app transition animation while recents is running." into tm-dev
2022-05-31 15:48:01 +00:00
Sorin Basca
ac8e1f6cf3
Merge "Bump supported source version."
2022-05-31 15:44:43 +00:00
Jing Ji
57e03f3b30
Merge "Add component types which a process is hosting into the proc memstats" into tm-dev
2022-05-31 15:37:52 +00:00
Chavi Weingarten
ddf2f52d9f
Merge "Toast: Fix JE caused by service not bind"
2022-05-31 15:27:20 +00:00
Mady Mellor
533d85f39d
Merge "Fix the pointer position when displayed in RTL" into tm-dev am: 91d28d1b21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18620988
Change-Id: I37f0488d5478c379ee1fbc9a05fd52fe384a0db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 15:14:53 +00:00
Patrick Baumann
e5f232058f
Merge "Add visibility special casing for sdk sandbox" into tm-dev am: f598205c2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18636029
Change-Id: I0b7e1d7a023b9bef1d4b6c81c88d89a4a8cd14fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 15:13:06 +00:00
Mady Mellor
91d28d1b21
Merge "Fix the pointer position when displayed in RTL" into tm-dev
2022-05-31 15:10:09 +00:00
Patrick Baumann
f598205c2d
Merge "Add visibility special casing for sdk sandbox" into tm-dev
2022-05-31 14:56:37 +00:00
Hongwei Wang
4c4b7ef959
Validate content overlay before removal
...
Bug: 234158920
Test: atest --iteration 20 --no-bazel-mode \
PinnedStackTests#testLaunchTaskByAffinityMatchSingleTask
Change-Id: I1ed848fcd742443a23ecaa17ba6b4fb8cdb061e2
2022-05-31 10:40:53 +00:00
Anton Hansson
ad25b2a205
Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE" am: ab498bff17 am: 755b013a70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110704
Change-Id: I69726559de01786dc7fecc50c0a3ce8a113b0137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 09:42:20 +00:00
Anton Hansson
476557fd43
Revert^2 "Convert filegroup to library" am: 4e8ccccbec am: 84ed6576e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110234
Change-Id: I0250df1c943c4596bc2ce5403730ce6fd4398745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 09:41:46 +00:00
Anton Hansson
755b013a70
Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE" am: ab498bff17
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110704
Change-Id: I8268c4076ea2f34c04bf0a6edecf6f4c2731910a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 09:19:14 +00:00
Anton Hansson
84ed6576e9
Revert^2 "Convert filegroup to library" am: 4e8ccccbec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110234
Change-Id: Ic55f71169f0d4de03f3442b0182a8e1c43a7b9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 09:19:03 +00:00
Anton Hansson
ab498bff17
Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE"
...
* changes:
Make modules-utils-locallog available to platform
Revert^2 "Convert filegroup to library"
2022-05-31 08:58:43 +00:00
Tomasz Wasilczyk
232e5057be
Bump supported source version.
...
This fixes a warning about source version RELEASE_8 being less than 9.
Test: build settings app and watch console output
Change-Id: Iaeb054d2faee8ff204b0d5477ebe062ec4aa1afd
Merged-In: Iaeb054d2faee8ff204b0d5477ebe062ec4aa1afd
2022-05-31 08:49:38 +01:00
Zoey Chen
d04223d4f5
[automerger skipped] Merge "[LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT" am: 1a4b945fc4 am: 35ba92905d -s ours
...
am skip reason: Merged-In I0d10c9e34cfaeeb0f3cf1f0a2acbfda0cce0df13 with SHA-1 1ecdf9225c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107988
Change-Id: I77cb7711e4935d6e1940b409f56b6b8925609340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 04:22:37 +00:00
Zoey Chen
35ba92905d
Merge "[LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT" am: 1a4b945fc4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107988
Change-Id: I68b8574f60c544310ac7f0c427c573215b77ad49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 03:57:00 +00:00
Zoey Chen
1a4b945fc4
Merge "[LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT"
2022-05-31 03:27:51 +00:00
Robert Horvath
b8dbb51759
Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274
Change-Id: I03c6e7abd4245653accc4a2fa1a472861dd4f0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 18:07:18 +00:00
Robert Horvath
7929de42bd
Extract privacy item monitoring interface, add AppOpsPrivacyItemMonitor am: 3a89e62694
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375273
Change-Id: I36cf476045daefe9ca7589199c5d63c8e8e7c59e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 18:07:13 +00:00
Robert Horvath
d59d17d74a
Merge changes from topic "privacy-type-media-projection" into tm-dev
...
* changes:
Add MediaProjection privacy item type
Extract privacy item monitoring interface, add AppOpsPrivacyItemMonitor
2022-05-30 17:43:32 +00:00
Anton Hansson
a08352e838
Make modules-utils-locallog available to platform
...
Makes CellBroadcastServicePlatform able to use it.
Test: lunch aosp_cf_arm_only_phone && m nothing
Change-Id: Ic62dff140f81db9aac4728ba98b44e6fbbdc9c0c
2022-05-30 17:09:53 +00:00
TreeHugger Robot
d93a8f930d
Merge "Invalidate autofill session on IME disconnect" into tm-dev am: c17eae2651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18646671
Change-Id: If35353300cc711e1441afe1d783c8cbd4057b5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 17:08:10 +00:00
TreeHugger Robot
c17eae2651
Merge "Invalidate autofill session on IME disconnect" into tm-dev
2022-05-30 16:50:17 +00:00
Anton Hansson
4e8ccccbec
Revert^2 "Convert filegroup to library"
...
5fca5ff385
Change-Id: I1a020fffc6345a131453b27d6f8bc2cf0acb942b
2022-05-30 16:41:42 +00:00
Jinfeng Du
c2f6a875bd
Merge "Revert "Convert filegroup to library"" am: 0801f8008b am: 53d695ed20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110247
Change-Id: I2cfff0eccca0a9e3860297b32c1a54c2f83f7340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 15:36:12 +00:00
Jinfeng Du
53d695ed20
Merge "Revert "Convert filegroup to library"" am: 0801f8008b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110247
Change-Id: I057a027af4d6dc4db8f99f4692f25970d77b070e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 15:12:43 +00:00
Jinfeng Du
0801f8008b
Merge "Revert "Convert filegroup to library""
2022-05-30 14:51:21 +00:00
Jinfeng Du
5fca5ff385
Revert "Convert filegroup to library"
...
Revert "Add dependency on modules-utils-local-log"
Revert submission 2108043-locallog
Reason for revert: b/234350536
Reverted Changes:
I2e873458d:Replace source dependency with library
I95d270e5e:Convert filegroup to library
I17c77d972:Add dependency on modules-utils-local-log
I2e873458d:Replace source dependency with library
Change-Id: I551b1e6e0498599fb48d368e079958257065fdb4
2022-05-30 14:49:04 +00:00
Anton Hansson
8edb229d23
Merge "Convert filegroup to library" am: dffbaaed39 am: 332131017f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108043
Change-Id: I1e1bcaab980715949ee3f76de16f408608e124ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 12:41:10 +00:00
Ming-Shin Lu
b93d7f48d8
Merge "Fix snapshot starting window isn't apply fixed-rotation with IME visible" into tm-dev am: c2a6a2efeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659525
Change-Id: Ief88e870bcd57f7200a9f7e3bd89fbaab7137c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 12:39:42 +00:00
Anton Hansson
332131017f
Merge "Convert filegroup to library" am: dffbaaed39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108043
Change-Id: I8dd0b6f3fbfb50a7cbcda6aa9f80e0405d0e3bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 12:25:25 +00:00
Ming-Shin Lu
c2a6a2efeb
Merge "Fix snapshot starting window isn't apply fixed-rotation with IME visible" into tm-dev
2022-05-30 12:24:51 +00:00
Anton Hansson
dffbaaed39
Merge "Convert filegroup to library"
2022-05-30 12:02:47 +00:00
Anton Hansson
93298d6e83
Use already compiled library
...
No point compiling these sources once again, just use the existing
library.
Test: m com.android.wifi
Change-Id: I304bff8f34c3d4d9e00be31c9aa3c40c63cd0dd0
2022-05-30 11:58:01 +00:00