Lee Shombert
ce03276f68
Merge "Create os/IpcDataCache" into tm-dev am: 53dd894d42 am: 24cde25a66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17083666
Change-Id: Ided71a9aa064b511826b389f7f3d2a85b08c09b5
2022-03-07 21:02:05 +00:00
Pinyao Ting
b24b057510
Merge "Additional safecheck before calling AppSearch from ShortcutService"
2022-03-07 20:53:24 +00:00
Prabir Pradhan
57671e44f6
Merge "Re-land "Use SOURCE_CLASS_POINTER as the default source for MotionEvent"" into tm-dev am: e2722fe948
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106783
Change-Id: Ia5b3acafe9e38cd52a91aeea2a7e1d55934d1239
2022-03-07 20:50:03 +00:00
Roman Kiryanov
7cbbecd13a
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3 am: 19929dffff am: a4873fa83b am: 33e3c43571 am: e531927a16
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: I04f6f6db8af7a43baec6cc85337e2e6c6a6292ab
2022-03-07 20:42:22 +00:00
Hao Ke
f74a2e3ee6
Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6 am: de47f43890 am: e89ba03962 am: 994d057e9e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550
Change-Id: I1ce336d7b46e36cb483e7b08f65d093fb05e11f3
2022-03-07 20:41:29 +00:00
Automerger Merge Worker
9a76e69c5e
Merge "Merge "Create os/IpcDataCache" into tm-dev am: 53dd894d42"
2022-03-07 20:41:10 +00:00
Treehugger Robot
b31a9aa965
[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b am: f038fd9687 -s ours am: 809f8f8062 -s ours am: c0e62e8dd1 -s ours
...
am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e30 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: I2c25b91c67c4d74adf7cb3d5f68a24407bcea2f9
2022-03-07 20:40:28 +00:00
Lee Shombert
5bb0cc3ac2
Merge "Create os/IpcDataCache" into tm-dev am: 53dd894d42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17083666
Change-Id: Ia1b40845c872ac8a849990bb75692bbe3f5f0679
2022-03-07 20:40:28 +00:00
Lee Shombert
24cde25a66
Merge "Create os/IpcDataCache" into tm-dev am: 53dd894d42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17083666
Change-Id: I8904e4eb256b074f41c41de5c5c004468431e229
2022-03-07 20:40:03 +00:00
Prabir Pradhan
e2722fe948
Merge "Re-land "Use SOURCE_CLASS_POINTER as the default source for MotionEvent"" into tm-dev
2022-03-07 20:33:41 +00:00
Lee Shombert
53dd894d42
Merge "Create os/IpcDataCache" into tm-dev
2022-03-07 20:26:05 +00:00
Roman Kiryanov
3a0a566adc
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3 am: 19929dffff am: a4873fa83b am: 33e3c43571
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: Iac1523a356e345661478e6cb8a45f890409b4bfd
2022-03-07 20:18:08 +00:00
Hao Ke
6f00b9f159
Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6 am: de47f43890 am: e89ba03962
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550
Change-Id: I842e3ea5e9b89169d82d25eb2c9b6d05ea3bd7b1
2022-03-07 20:17:23 +00:00
Roman Kiryanov
e531927a16
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3 am: 19929dffff am: a4873fa83b am: 33e3c43571
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: I8ff4c7c93ac9841296387b8a65773c2a5ceee678
2022-03-07 20:17:04 +00:00
Hao Ke
994d057e9e
Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6 am: de47f43890 am: e89ba03962
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550
Change-Id: I7b3f11f6c274362e07ce1113d8aac267bea8e50a
2022-03-07 20:16:39 +00:00
Treehugger Robot
b1e6f14262
[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b am: f038fd9687 -s ours am: 809f8f8062 -s ours
...
am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e30 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: Ide21e81e69bf97971dc0a1ea914dc80b037a49ef
2022-03-07 20:16:20 +00:00
Treehugger Robot
c0e62e8dd1
[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b am: f038fd9687 -s ours am: 809f8f8062 -s ours
...
am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e30 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: Ic783745d16a2de333c442b37e897bcccbd9b3dab
2022-03-07 20:15:44 +00:00
Ronish Kalia
7f0831dedf
Merge "Use ActivityService from lock screen"
2022-03-07 20:06:26 +00:00
Kevin Lubick
c3046ab2d4
Merge "Fix transitive dependencies on SkImageEncoder"
2022-03-07 20:03:58 +00:00
Diego Vela
26d63530ac
Merge changes from topic "wm-config-change-fix-tm-dev" into tm-dev am: 892cf8246f am: 89309a8f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988995
Change-Id: Ibe2249c32bb6f7c06ab143621d3d39499a7e30f8
2022-03-07 19:56:32 +00:00
Christian Göllner
486dab161b
Merge "Fix test: LockscreenShadeTransitionControllerTest" into tm-dev am: 16da0b0898 am: 212797b247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106089
Change-Id: I64b6334e4e1dfe9e78b76b70884323c99ebd68ed
2022-03-07 19:55:40 +00:00
Etienne Ruffieux
db2b9d62bb
Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9 am: a6f8e92f13 am: 563f940c10
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850
Change-Id: Ib42fdb9fa613db045d6ee1b4ed860f16ce02a627
2022-03-07 19:54:52 +00:00
Caitlin Cassidy
e292fa0875
Merge "[Media TTT] Turn the screen on when the chip first displays." into tm-dev am: ba4caf4de1 am: a310be7161
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17086903
Change-Id: I78ea99cddf60c90bcb86470ca37f49447d8ea268
2022-03-07 19:53:46 +00:00
Roman Kiryanov
33e3c43571
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3 am: 19929dffff am: a4873fa83b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: I814ee6aff7f3dce121f999c801e0dcc97808d56b
2022-03-07 19:53:42 +00:00
Hao Ke
e89ba03962
Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6 am: de47f43890
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550
Change-Id: If8689584af819b0e1a4e6cd145835e567d970dff
2022-03-07 19:52:53 +00:00
Roman Kiryanov
a4873fa83b
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3 am: 19929dffff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: I83347e10bbec5c4c4874c1ce1b5411c99fca1522
2022-03-07 19:52:46 +00:00
Treehugger Robot
809f8f8062
[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b am: f038fd9687 -s ours
...
am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e30 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: I325e8bf50383c7129355efb98742d8fc1a531bb5
2022-03-07 19:51:57 +00:00
Diego Vela
e8e35eb737
Merge changes from topic "wm-config-change-fix-tm-dev" into tm-dev am: 892cf8246f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988995
Change-Id: Iea6af88e495415b70d6223c64b040141388ec4cc
2022-03-07 19:35:38 +00:00
Diego Vela
92f22297a7
Add LifecycleCallback adapter. am: 3b9f2b53b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988633
Change-Id: If84fd3718e2c1354f4b888010e8429c93d2a8d97
2022-03-07 19:35:09 +00:00
Diego Vela
8787e9f2ee
Merge state producer and feature producer. am: 2756dd3d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16987852
Change-Id: Id35d43ab916d1cfc1924e3665c003cc9b392c817
2022-03-07 19:34:29 +00:00
Diego Vela
51ea182ca6
Remove DisplayFeature from common package. am: 3084663801
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16991046
Change-Id: Icc26729f67e9c9ec4d63967bd840315a6246dfa6
2022-03-07 19:34:02 +00:00
Christian Göllner
b3d075dafd
Merge "Fix test: LockscreenShadeTransitionControllerTest" into tm-dev am: 16da0b0898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106089
Change-Id: I8da95d091fe595c9c54acb8d49212848ed7d15d5
2022-03-07 19:32:33 +00:00
Diego Vela
89309a8f9a
Merge changes from topic "wm-config-change-fix-tm-dev" into tm-dev am: 892cf8246f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988995
Change-Id: I3a91c665ef984b09776f1857e5130daa4462461c
2022-03-07 19:32:20 +00:00
Etienne Ruffieux
2a06384189
Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9 am: a6f8e92f13
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850
Change-Id: Ifa9294962b31baaa28625ebf36b3f8e7e2564449
2022-03-07 19:31:31 +00:00
Christian Göllner
212797b247
Merge "Fix test: LockscreenShadeTransitionControllerTest" into tm-dev am: 16da0b0898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106089
Change-Id: Id66b7bdae0c799c95f364075e21869b7f5dedad6
2022-03-07 19:31:12 +00:00
Caitlin Cassidy
da61093ce3
Merge "[Media TTT] Turn the screen on when the chip first displays." into tm-dev am: ba4caf4de1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17086903
Change-Id: I1f1ba81206e581037df07612d02b4b945e87a7c3
2022-03-07 19:30:28 +00:00
Etienne Ruffieux
563f940c10
Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9 am: a6f8e92f13
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850
Change-Id: I94348aa1eaa0f499c2aa8ee8e539dc6c6309451a
2022-03-07 19:30:12 +00:00
Caitlin Cassidy
a310be7161
Merge "[Media TTT] Turn the screen on when the chip first displays." into tm-dev am: ba4caf4de1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17086903
Change-Id: Ie7e97f5ad4b301ab2ce77de537410e6abef7b905
2022-03-07 19:30:00 +00:00
Roman Kiryanov
19929dffff
Merge "Set host's clipboard in a separate thread" am: 7a3a3a77d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007913
Change-Id: I2bf469307acd968bf4faa789a9325173d6351c1d
2022-03-07 19:28:31 +00:00
Hao Ke
de47f43890
Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550
Change-Id: Iedf232fe99b2e70b3d56c848d213a46dc2593ff6
2022-03-07 19:19:54 +00:00
Treehugger Robot
f038fd9687
Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: Ic2e7e9ce48ada1ee15ead37055a49c209190f437
2022-03-07 19:19:24 +00:00
Diego Vela
892cf8246f
Merge changes from topic "wm-config-change-fix-tm-dev" into tm-dev
...
* changes:
Listen for config changes when updating features.
Add LifecycleCallback adapter.
Merge state producer and feature producer.
Remove DisplayFeature from common package.
2022-03-07 19:13:45 +00:00
Julia Tuttle
7b03969e98
Merge changes I1ed99b7f,I404a307a
...
* changes:
New Pipeline: Move SectionClassifier to the provider package
New Pipeline: Move SectionHeaderVisibilityProvider to the provider package
2022-03-07 19:11:12 +00:00
Christian Göllner
16da0b0898
Merge "Fix test: LockscreenShadeTransitionControllerTest" into tm-dev
2022-03-07 19:10:51 +00:00
Etienne Ruffieux
a6f8e92f13
Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850
Change-Id: If9003c519ff66d39c6394e2c3d5f6aa00373097a
2022-03-07 19:08:28 +00:00
Eric Biggers
87135be964
Merge changes I9bdd1a4b,Ia1db01ab
...
* changes:
Ignore errors preparing user storage for existing users
UserDataPreparer: reboot to recovery for system user only
2022-03-07 19:03:22 +00:00
Caitlin Cassidy
ba4caf4de1
Merge "[Media TTT] Turn the screen on when the chip first displays." into tm-dev
2022-03-07 19:03:04 +00:00
Roman Kiryanov
7a3a3a77d3
Merge "Set host's clipboard in a separate thread"
2022-03-07 19:02:05 +00:00
Michał Brzeziński
51e873ea35
Merge "Fixing top notifications cut off on the lockscreen" into tm-dev am: 612b7a69dc am: bd0fcb78e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071469
Change-Id: I17c52302b7494e940693abadf52be4552bc33b27
2022-03-07 18:50:37 +00:00
Neha Pattan
34f49d85a4
Merge "(1/2) Add AdServices related permissions to manifest." into tm-dev am: f0d3c47fe6 am: cc1f211dbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17059966
Change-Id: If09b65211b1f379904ab24a2a9308f62b2619053
2022-03-07 18:50:08 +00:00