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

764844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jing Ji
d6196227be [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours am: 07010d6514 -s ours am: 31fc4ee296 -s ours am: 5e63482a03 -s ours am: b5c2e44c87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie04360b6b3329a16f99936fecaa7d3ce5c9a8d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 02:05:14 +00:00
Jing Ji
2a3969ff66 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours am: 8ddb18fb3e -s ours am: 186100635a -s ours am: 7551bea4bf -s ours am: ff52c2b11a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41ed013af3a0b3b4bdc00f160fd1d0f0e2b5f6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 02:04:43 +00:00
Jing Ji
b5c2e44c87 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours am: 07010d6514 -s ours am: 31fc4ee296 -s ours am: 5e63482a03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I166ba8a52a95512ef04ac5e0f65cd4dd203d0b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:38:45 +00:00
Jing Ji
ff52c2b11a [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours am: 8ddb18fb3e -s ours am: 186100635a -s ours am: 7551bea4bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccfdc256b01b7f47b9749b17817d32fbfd289c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:38:35 +00:00
Jing Ji
904cdb30c2 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours am: 9b39c5f6b3 -s ours am: 076ca82a28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49e5e78e3196dadc8be7c7231853368c0efdc7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:06:03 +00:00
Jing Ji
5e63482a03 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours am: 07010d6514 -s ours am: 31fc4ee296 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb46bf1a297e33ca92e5e8756703dbb7f734940b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:06:01 +00:00
Jing Ji
7551bea4bf [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours am: 8ddb18fb3e -s ours am: 186100635a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92800580c11b846835f979bf28e1bc1bfcd6b241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:05:55 +00:00
Jing Ji
77a3d63468 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours am: 11a01ff266 -s ours am: aa38c57378 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf650da4c31ebbc8c2a07f7d228bab25a3843bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:05:35 +00:00
Jing Ji
31fc4ee296 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours am: 07010d6514 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8cdfc3c71c0e5226327679521443522690a01268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 00:20:55 +00:00
Jing Ji
186100635a [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours am: 8ddb18fb3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iceebfd8c472534011fa0b87100966a7ed4708b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 00:20:35 +00:00
Jing Ji
076ca82a28 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours am: 9b39c5f6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e2888956192d094ef9fa7dd19562faad1c58d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 00:09:02 +00:00
Jing Ji
aa38c57378 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours am: 11a01ff266 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2f986315c54fb138132e725098fe57290480457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 00:08:59 +00:00
Jing Ji
07010d6514 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I625ad72239921ee99824abffd900c67f0d970e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:50:37 +00:00
Jing Ji
8ddb18fb3e [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584fd6edff8e35d805606db374b2145855514047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:50:21 +00:00
Jing Ji
9b39c5f6b3 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic85b219126c0e4186b11fe0748c790563446b5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:36:03 +00:00
Jing Ji
11a01ff266 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d6f8846e7ff09f53c075af762d3e8081786cb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:35:57 +00:00
Jing Ji
f90ec68dfa [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id94acb14dc5215f5554cc948a9f131e9d284a759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:21:38 +00:00
Jing Ji
b899c83312 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf468a8bb485b2492f464be0a094a65bbdbdea8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:21:04 +00:00
Jing Ji
c8640975fb [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6885682464073cb62aa96a555682db9435343417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:54:50 +00:00
Jing Ji
b41a54fdc3 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Iab0ef2b26f0c30b5954a96fc67ca1acfbad13e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:54:20 +00:00
Jing Ji
fee2e78547 [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19843ab9cac8ea88fdd8c78bef518d4d1d430af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:54:06 +00:00
Jing Ji
434c657230 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61548f6f9d5c0705fd751ef407ccee3e3ba62aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:53:06 +00:00
Jing Ji
1d6a1c98a2 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6597e73ce54554cb9aa87db992f701a319c2137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:52:41 +00:00
Jing Ji
72967ce869 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592

Change-Id: I00e1b07a3f5031661fa04732b79aa30fdaa1da1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:44:55 +00:00
Jing Ji
0c4ae95734 DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592

Change-Id: I37245593a4a8b7c0f5225d38bdb3054d883a6bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:44:45 +00:00
Jing Ji
50e469e8ff [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72ff403644354ed30bc2b27e7be28e44fb42f5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:43:30 +00:00
Jing Ji
673ddf6188 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I2b17c7ce1d6f4280c56916e3783a56087469b493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:42:13 +00:00
Jing Ji
3e3793070e [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad57fc18222b0b5a5eb6ac2226cac901c7487702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:42:02 +00:00
Jing Ji
e6bfe173ca Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Ib51225a3c4ebfd8830b0ba4280085364e838bbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:39:35 +00:00
Jing Ji
f5763f34ed [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev am: a268a99083 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id711a137d03663e2774aaf05425c246ad21905a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:37:47 +00:00
Jing Ji
678758d116 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99f34d2515ea84a39de5f40760229a72bf35a862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:37:14 +00:00
Jing Ji
b1003d47de Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I7a836e1526668623fd19b6b23534eae270252df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:25:56 +00:00
Jing Ji
42c14393e6 DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: If2c17dd1a5d80952dd61e3b58cf4eaf18f4ee70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:25:41 +00:00
Jing Ji
a268a99083 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev 2022-11-14 22:11:38 +00:00
Jing Ji
8274886238 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev 2022-11-14 22:11:13 +00:00
Jing Ji
4eca7b30b8 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev 2022-11-14 22:10:39 +00:00
Jing Ji
1b9028d0dd Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev 
* changes:
  [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77
  DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now.
 2022-11-14 22:10:38 +00:00
Jing Ji
ca7d20c52e Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev 2022-11-14 21:28:19 +00:00
Nolan Scobie
3b5f7cb4ba Merge "docs: Note that antialiasing is not supported on multiple Canvas draw ops" into tm-dev 2022-11-14 19:30:01 +00:00
Rex Hoffman
f98c04b242 Merge "Enable new_robolectric" into tm-dev 2022-11-10 20:05:44 +00:00
Fabian Kozynski
b88d1edcf5 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ie79f598c7f3b076bdbb38ae3d02c95eda31e12c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:56:33 +00:00
Fabian Kozynski
6135ae4a38 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I0b1dea98270d93b3187ed63e711409030c24bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:55:45 +00:00
Fabian Kozynski
5354054d12 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I6ff27e2d1318aac7a78609a1ec48614ccf6dba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:40 +00:00
Fabian Kozynski
ec9ad94152 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I2b7706b9ae0f0121b4c7df09e91c01b741435cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:27 +00:00
Fabian Kozynski
1afdf37316 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ib99c0417de67f2dbfbd8ad71ab38ea503d210936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:46 +00:00
Fabian Kozynski
3f4a4083e3 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I7d395ec75d402c5a207b340ed5e34dca5f1abbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:42 +00:00
Fabian Kozynski
39357500b7 Merge "Disable click on privacy chip before provision" into sc-dev 2022-11-10 14:19:46 +00:00
Naomi Musgrave
34554688b3 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b am: 4bcc341683 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I253b9569c522386b35988e3a93c2772032287952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:59:13 +00:00
Naomi Musgrave
7dbcebf2ae Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I3589a3b1582e0112f991b02d4712b450033ae889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:58:30 +00:00
Naomi Musgrave
4bcc341683 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I2559c38571060d6a80ee540e38304c5db3912da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:46:44 +00:00