wescande
|
2cd901b094
|
Migrate dependency from base to modules-utils
Use stand-alone modules-utils library.
Bug: 198418216
Tag: #refactor
Test: Build
Change-Id: I248dc29e68d3564c6723626b683b10c8a863853f
|
2021-09-09 18:24:41 +00:00 |
|
TreeHugger Robot
|
d7fa27e3af
|
Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master am: d9d1dd7c53 am: c993f1b2c1 am: dbd5cf8828 am: ed4aa69904
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786914
Change-Id: Ia3a52944455996fe66706bed50d66eb38520acdf
|
2021-09-09 18:20:02 +00:00 |
|
TreeHugger Robot
|
ed4aa69904
|
Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master am: d9d1dd7c53 am: c993f1b2c1 am: dbd5cf8828
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786914
Change-Id: I7558b728e002488da5e38311378b793834800336
|
2021-09-09 18:07:25 +00:00 |
|
Dmitri Plotnikov
|
bfc3bb8d0c
|
Merge "Use CursorWindow to hold BatteryConsumer data"
|
2021-09-09 17:52:19 +00:00 |
|
TreeHugger Robot
|
dbd5cf8828
|
Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master am: d9d1dd7c53 am: c993f1b2c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786914
Change-Id: I15ba4a010d1c5920af74837e4d12d51985d5ab8d
|
2021-09-09 17:42:36 +00:00 |
|
Soonil Nagarkar
|
edea4d6795
|
Merge "Support batched requests < GNSS batched size" into sc-qpr1-dev am: f4e2f279b1 am: bafcdd73ca am: 1249a3bee9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15687541
Change-Id: I6ca94d51410a1863ef0dc901b7536a6de38f405e
|
2021-09-09 17:42:18 +00:00 |
|
Beth Thibodeau
|
415d8bee3c
|
Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692 am: 84a37a092c am: 13b46d350b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15677510
Change-Id: If3b0e5ec7f8007540ad5cbf93bba09feafbc77ce
|
2021-09-09 17:41:44 +00:00 |
|
Soonil Nagarkar
|
cda0e44fb5
|
Merge "Support batched requests < GNSS batched size" into sc-qpr1-dev am: f4e2f279b1 am: 63aba941b2 am: 858af30f58
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15687541
Change-Id: I11e95714c204437dcb82e22756d986be74025e95
|
2021-09-09 17:41:09 +00:00 |
|
TreeHugger Robot
|
ea02baee67
|
[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-dev am: f632b44030 -s ours am: 3aa1729dcf -s ours am: a832929c3c -s ours am: 092c4bf3b7 -s ours
am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 aacc61be3d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15787608
Change-Id: I61fa88c638e653197e756b190e660a5e7231935a
|
2021-09-09 17:40:31 +00:00 |
|
Adam He
|
c942c8b6f9
|
Merge "Fill in javadocs for translation feature." into sc-dev am: 1553fc7fad am: 4b02f45293 am: e6664abbc8 am: 246228c35f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15597859
Change-Id: I9957d89e9377b6b6a580032d62fc624ccf51fdf5
|
2021-09-09 17:39:52 +00:00 |
|
TreeHugger Robot
|
1519c13d41
|
Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f am: 6a50b1c077 am: eccb58cb92 am: 20aa51d4cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907
Change-Id: I7948bf7f11371a500c21faec6e6c6e2a7e688e6d
|
2021-09-09 17:39:25 +00:00 |
|
TreeHugger Robot
|
3f7b05b56f
|
Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 am: e84ac2fe0d am: 75506c46b5 am: 049dcbc4ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907
Change-Id: Ie4006acc5f8e8dfd086a7c1230f7f4133a988df1
|
2021-09-09 17:39:00 +00:00 |
|
Wu Ahan
|
9a3ff5bdcf
|
[automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: 7afe2f3723 -s ours am: a7b9b6519b -s ours am: 43fd995061 -s ours
am skip reason: Merged-In Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c with SHA-1 7141ab2619 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424
Change-Id: I86fe6f8a6728427c19e2605311e863cfbc367db2
|
2021-09-09 17:38:37 +00:00 |
|
Automerger Merge Worker
|
ca0b350a37
|
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: fe0e3e3454 -s ours am: 471ebc97c4 -s ours am: 06fe3f2674 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: Ib1cd9be90741d9aa9a333eb3ec60ccb0c0f9c95d
|
2021-09-09 17:38:19 +00:00 |
|
Kholoud Mohamed
|
edf3f4743b
|
[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours am: 5361a95cf7 -s ours am: b406329f6b -s ours am: 6dee831f12 -s ours am: 6d88deebb4 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: Icce7d97007c513e1fb7ced2f5943c43cb3ee7d49
|
2021-09-09 17:37:50 +00:00 |
|
Kholoud Mohamed
|
4b1dd52858
|
[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d83b -s ours am: 500b32ea3c -s ours am: 1dbeaebf72 -s ours am: efe21c9199 -s ours am: e1c036a48c -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 4670d1d855 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15596381
Change-Id: I120eba5ea2c3cf264b7c88bee769f76fdda83bbe
|
2021-09-09 17:37:00 +00:00 |
|
Beth Thibodeau
|
2b93ea1510
|
Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692 am: 55aca3e1a7 am: b2e24576b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15677510
Change-Id: I075a02c4d1ce20ea66bdae8988552ef6a1bfe96d
|
2021-09-09 17:36:28 +00:00 |
|
Automerger Merge Worker
|
8c1acdb25b
|
Merge "Merge "[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-dev am: f632b44030 -s ours am: 3aa1729dcf -s ours am: 4fcdb99ceb -s ours" into sc-v2-dev-plus-aosp am: 4064c2969a -s ours"
|
2021-09-09 17:36:03 +00:00 |
|
Automerger Merge Worker
|
97838ea830
|
Merge "[automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-dev am: f632b44030 -s ours am: 3aa1729dcf -s ours am: 4fcdb99ceb -s ours" into sc-v2-dev-plus-aosp am: 4064c2969a -s ours
am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 43b0f37a70 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15787608
Change-Id: I3a979eb723ee9f0d0b928982a0f4e43fd7467d64
|
2021-09-09 17:35:37 +00:00 |
|
Fabian Kozynski
|
d53d2d0d23
|
Merge "Add API for requesting add TileService"
|
2021-09-09 17:35:26 +00:00 |
|
TreeHugger Robot
|
99463ef79f
|
[automerger skipped] Merge "Clean up ownership in frameworks/base/" into sc-dev am: 88c2fc9cea am: bdd1e411ea am: d7f0b9dcd6 -s ours am: 75da66535d -s ours
am skip reason: Merged-In I04bee764bf50734523ff2210d30ed052dcb036bd with SHA-1 fefe435dd4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778521
Change-Id: I9c23730a571a93556ae258e94669da7053d364d5
|
2021-09-09 17:34:49 +00:00 |
|
Adam He
|
2165a0dfd6
|
Merge "Fill in javadocs for translation feature." into sc-dev am: 1553fc7fad am: 4b02f45293 am: db0fbc2f0e am: 0943b1df1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15597859
Change-Id: I8811e70a0b9b64cb89f5077ed79487df5787f7c5
|
2021-09-09 17:34:05 +00:00 |
|
Automerger Merge Worker
|
a2dad66e9b
|
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev am: a955df6ebc -s ours am: 6afcf91463 -s ours am: 7859bf9e75 -s ours" into sc-v2-dev-plus-aosp am: fbe8354270 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15780233
Change-Id: I3fe95d81b8ac714bcd2c9771eb7c8c8f47c6796c
|
2021-09-09 17:33:42 +00:00 |
|
TreeHugger Robot
|
e3a8d5ba7d
|
Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f am: 6a50b1c077 am: c9c4feb0b9 am: a4795125e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907
Change-Id: I7e57c612f6a79c2d84264f6736fbd010cc7e6802
|
2021-09-09 17:33:09 +00:00 |
|
Automerger Merge Worker
|
c9af2eb43d
|
Merge "Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 am: e84ac2fe0d am: 67f1666d74" into sc-v2-dev-plus-aosp am: 93d2227a2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907
Change-Id: I6baa7e8f95e06d224febb5656b6dea3496187f86
|
2021-09-09 17:32:46 +00:00 |
|
Curtis Belmonte
|
8a2391f5f2
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment" into sc-dev am: 9d0955d75f -s ours am: 56988af4b3 -s ours am: c7769fd287 -s ours am: 130f9be83f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15780059
Change-Id: I2d9092ff511b961417dca4abeb33d952eb422342
|
2021-09-09 17:32:20 +00:00 |
|
Automerger Merge Worker
|
1217092f4a
|
Merge "[automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: 7afe2f3723 am: 509675dea0 -s ours" into sc-v2-dev-plus-aosp am: a21d61b4f7 -s ours
am skip reason: Merged-In Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c with SHA-1 7141ab2619 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424
Change-Id: I18c936bc2799b24210a57d5ec949080e9feb3117
|
2021-09-09 17:31:56 +00:00 |
|
shubang
|
29f54b7804
|
TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 53d4a43fac am: b4bd7095e9 am: 6a6b97823f am: 4dde63e4a4 am: 7299f4c495
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564
Change-Id: Icfadd204df7b59d49eab3e3eb8ec8b9de4bf1499
|
2021-09-09 17:31:22 +00:00 |
|
Automerger Merge Worker
|
fd512e1ed0
|
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: fe0e3e3454 -s ours am: ca0699c776 -s ours am: 50dffc3784 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: Idda1d451b8e1ea5e9ac70969b1bd1ee35136683a
|
2021-09-09 17:30:58 +00:00 |
|
shubang
|
7200783a6d
|
TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 7c93ad5848 am: 0daba53082 am: 7fd04764a9 am: 4cd54e216f am: 4a581c8766
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564
Change-Id: Ie76ef5f7db853a9f5c7fe9cc25e8fc1bf0191f5b
|
2021-09-09 17:30:25 +00:00 |
|
Automerger Merge Worker
|
f38acbc134
|
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours am: 5361a95cf7 -s ours am: b406329f6b -s ours am: a9f52f8020 -s ours" into sc-v2-dev-plus-aosp am: 898f09fd9e -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: I248c2bbbe277acadfba2586047940a55cd77e4b3
|
2021-09-09 17:30:04 +00:00 |
|
Evan Chen
|
16ee8a1374
|
Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78aac am: 20f9cc3573 am: f45f60d56f am: b3b75a23a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15560908
Change-Id: Id5336c5710d63e5e98f3375e190ea8f709f862d0
|
2021-09-09 17:29:04 +00:00 |
|
TreeHugger Robot
|
c993f1b2c1
|
Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master am: d9d1dd7c53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786914
Change-Id: I1981f499e46264901eac1bbe321f7f428f432e70
|
2021-09-09 17:28:44 +00:00 |
|
Automerger Merge Worker
|
577a324559
|
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d83b -s ours am: 500b32ea3c -s ours am: 1dbeaebf72 -s ours am: 76103e2e3c -s ours" into sc-v2-dev-plus-aosp am: e6eeef27fb -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15596381
Change-Id: Ia3ade012fed5a35239a8f0f0b027afab57e3688e
|
2021-09-09 17:28:20 +00:00 |
|
Automerger Merge Worker
|
124653c11d
|
Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: f04c496b3b am: d90941ca06 am: 581ed87073 -s ours am: 0902644241 -s ours" into sc-v2-dev-plus-aosp am: 57fe0dea68 -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750102
Change-Id: If1eb8cc840ab93c43e3ae4007a9d6400542bedc9
|
2021-09-09 17:27:18 +00:00 |
|
TreeHugger Robot
|
13b5175488
|
[automerger skipped] Merge "Clean up ownership in frameworks/base/" into sc-dev am: 88c2fc9cea am: bdd1e411ea -s ours am: 69f3269b87 -s ours am: b79896a789 -s ours
am skip reason: Merged-In I04bee764bf50734523ff2210d30ed052dcb036bd with SHA-1 fefe435dd4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778521
Change-Id: If115bf72910742b65b7885fc8832d92f31a5c48e
|
2021-09-09 17:26:41 +00:00 |
|
TreeHugger Robot
|
ebb0dab24c
|
[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: d08e9f5aad am: 9d17f35793 am: bc87970e57 -s ours am: 1be8335d2f -s ours am: 49e9792866 -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 281777cf4c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750102
Change-Id: I9479855c9fc5ad313cd3a58df869df8bdd5a7f1d
|
2021-09-09 17:26:16 +00:00 |
|
Automerger Merge Worker
|
9b0f5883f5
|
Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-qpr-dev" into rvc-qpr-dev am: 9f4825bcd2 am: 58c145ca7a am: a9966eb000 -s ours am: b1af03aebc -s ours" into sc-v2-dev-plus-aosp am: b9408b5c2d -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750142
Change-Id: Ie6a7a4722281d6511495821ca20fb11c177a773d
|
2021-09-09 17:25:58 +00:00 |
|
Curtis Belmonte
|
86f30dc9ab
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev am: a955df6ebc -s ours am: 6afcf91463 -s ours am: 937a122be5 -s ours am: 632440eb02 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15780233
Change-Id: Iab26c4a4e4382e414c862736b6147e930dfd4c7e
|
2021-09-09 17:25:34 +00:00 |
|
Automerger Merge Worker
|
3810f90955
|
Merge changes from topic "am-c25266ec180d4fceae673e729d156217" into sc-v2-dev-plus-aosp am: e32e318bc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: I9f7c06907c7bcde3a52b325a527d1b949568b5c2
|
2021-09-09 17:25:02 +00:00 |
|
TreeHugger Robot
|
f460415cb9
|
[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df4f am: ec3f123bf9 -s ours am: 9bf0157d5f -s ours am: bb022106ef -s ours am: 2787813708 -s ours am: b31bf6b26c -s ours am: 7690b6e058 -s ours am: dc76e6aaff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: If5618853b02b410e7c9d6654daa45bb497eb0a9d
|
2021-09-09 17:24:53 +00:00 |
|
Curtis Belmonte
|
73a580c655
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment" into sc-dev am: 9d0955d75f -s ours am: 56988af4b3 -s ours am: 18e1fd272c -s ours am: 01389c4687 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15780059
Change-Id: Ic5b514712f6aa109f19c1d15b361842d6b5378e6
|
2021-09-09 17:24:11 +00:00 |
|
shubang
|
5ee79081df
|
TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 53d4a43fac am: b4bd7095e9 am: 6a6b97823f am: c59379b945 am: 084f08758c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564
Change-Id: I58200106a4d9014c7ad4ebe42384b75ba29c5076
|
2021-09-09 17:23:30 +00:00 |
|
Automerger Merge Worker
|
92aeb81c11
|
Merge changes from topic "am-bda2d9dc20054c69842a76df0eeffc2d" into sc-v2-dev-plus-aosp am: 43b6b0396f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: I8f9a74a1680ffcdd7a824a01386b1766e080b1b1
|
2021-09-09 17:18:33 +00:00 |
|
TreeHugger Robot
|
72358cf2f4
|
[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df4f am: ec3f123bf9 -s ours am: 9bf0157d5f -s ours am: 95fbe3a389 -s ours am: b8ec3622e5 -s ours am: 3235c7d0fe -s ours am: f6a2f44893 -s ours am: c61278961d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: Ide9e844f7c85cf2a535c16bd442f08b58d0d2a26
|
2021-09-09 17:18:16 +00:00 |
|
shubang
|
f8881f9405
|
TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 7c93ad5848 am: 0daba53082 am: 7fd04764a9 am: a0429987a6 am: 6052118b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564
Change-Id: I56f93853a5efe69cac4ee57f6ece3ad49e5d293b
|
2021-09-09 17:17:32 +00:00 |
|
Evan Chen
|
92e0d1593f
|
Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78aac am: 20f9cc3573 am: e551d240b2 am: b6fd96b002
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15560908
Change-Id: Ideaa46373712c23866b5a287804197a501ea9262
|
2021-09-09 17:17:05 +00:00 |
|
Automerger Merge Worker
|
166c7437b0
|
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev am: b4a1d57267 -s ours am: 34b3820f98 -s ours am: 67fad1ca83 -s ours" into sc-v2-dev-plus-aosp am: 8486b0c58d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15763851
Change-Id: I4434d137c11f94fd4ec0a45d6d27c2f29d906a59
|
2021-09-09 17:16:42 +00:00 |
|
TreeHugger Robot
|
9d588dab2b
|
[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: f04c496b3b am: d90941ca06 am: 581ed87073 -s ours am: 2dd1ec0b7e -s ours am: 2192f0e071 -s ours
am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750102
Change-Id: I3f67358ebf3270377a5f701d992a3d3b33d5b8b6
|
2021-09-09 17:16:20 +00:00 |
|
Automerger Merge Worker
|
9e30fc73ba
|
Merge "Merge "Mark RECOGNIZE_SPEECH Filter as ONLY_IF_NO_MATCH_FOUND" into sc-dev am: c94785d270 am: 6af84ab4c5 am: 861d97c2b4" into sc-v2-dev-plus-aosp am: faea9d660d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15685139
Change-Id: I1a6e6e5f249089aefad02cb915c13d7ca89be0de
|
2021-09-09 17:15:56 +00:00 |
|