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

778860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Mankoff
6b6a0de146 Replace Log.wtf with an exception in MediaCarouselController. 
These tests fail locally using Log.wtf prevents further tests
from running because it causes the test process to exit.

Also, @Ignore all of these tests as they still fail.

Bug: 253229241
Test: atest SystemUITests
Change-Id: Iad35b2559e0869ad80a0b3462c93127a98ae8524
 2022-11-02 20:10:27 +00:00
Louis Chang
847d0f53e7 Merge "Fix LockTaskModeTests failure" into tm-qpr-dev 2022-11-02 13:28:46 +00:00
Fabian Kozynski
c164c02c94 Merge "Do not animate icons in tiles that shouldn't" into tm-qpr-dev 2022-11-02 13:26:00 +00:00
Galia Peycheva
71bf4aaf9e Merge "Fix pip update transaction out of order" into tm-qpr-dev 2022-11-02 09:31:31 +00:00
Omar Miatello
269cef1fd5 Merge "OnScroll roundness type should be reset to 0f when the View is removed from the Shelf" into tm-qpr-dev 2022-11-02 09:25:18 +00:00
Tiger Huang
b54fd1af09 Merge "Don't play or cancel window animations of controllable insets sources" into tm-qpr-dev 2022-11-02 06:16:01 +00:00
Tony Huang
61b0628896 Merge "Update divider value when config changed" into tm-qpr-dev 2022-11-02 06:14:23 +00:00
Tony Huang
ecbb47cfca Update divider value when config changed 
Divider size and insets value might be changed when config changed,
we should update them too otherwise divider would keep same area
on SplitLayout but actually view area become small or large.

Bug: 256117210
Test: manual
Test: pass existing tests
Change-Id: I6532f41c58848797f14ae17cb26f1ae734c53573
 2022-11-02 06:13:00 +00:00
Bill Lin
d1de180cf1 Merge "[DO NOT MERGE]Fix AuthCredentialPatternView#onErrorTimeoutFinish() bug" into tm-qpr-dev 2022-11-02 04:51:25 +00:00
Jiaming Liu
72b75946f2 Merge "Fix invalidate rotation value which causes CTS failures" into tm-qpr-dev 2022-11-02 03:28:20 +00:00
TreeHugger Robot
d1e583c08d [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours am: 401eb93909 -s ours am: 35bd1367af -s ours am: 686603f686 -s ours am: 6ec31224b4 -s ours am: 3a23c94ad1 -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: Icdd83b2be57779203006536c0678c33aee97cfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 03:13:03 +00:00
TreeHugger Robot
3a23c94ad1 [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours am: 401eb93909 -s ours am: 35bd1367af -s ours am: 686603f686 -s ours am: 6ec31224b4 -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I3925de7e7ff991c968669b9de28f781c211c98b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 02:30:19 +00:00
TreeHugger Robot
6ec31224b4 [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours am: 401eb93909 -s ours am: 35bd1367af -s ours am: 686603f686 -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: Ieac22115371f9f22ce8b930488fcf3d5fad3a80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 01:43:30 +00:00
TreeHugger Robot
686603f686 [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours am: 401eb93909 -s ours am: 35bd1367af -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I1237dbac518fe169435d61d94a0e5eb90388aa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 01:18:35 +00:00
TreeHugger Robot
35bd1367af [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours am: 401eb93909 -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I280a719edf36e1a9db189f237b3aa95134126db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:46:05 +00:00
Ats Jenk
eaf2dc0792 Merge "Add @JvmField annotation to flags" into tm-qpr-dev 2022-11-02 00:23:28 +00:00
TreeHugger Robot
401eb93909 [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I8e9c71425d627e992fbca2037f5292a9531e2020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:19:26 +00:00
TreeHugger Robot
ed12a6b75e Merge "Add topActivity to the list of states that task organizer cares." into tm-qpr-dev 2022-11-01 23:45:37 +00:00
TreeHugger Robot
69b752610f [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: Ie2a00cb2c288b532b0aae0817f05f18a514e04a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 23:33:41 +00:00
TreeHugger Robot
ec86264fcb [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I7a391127593cc6a8014ed6cd4593ed5e4bd6ce06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 23:03:52 +00:00
Wenhao Wang
5e0b472752 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours am: 1ce1c06835 -s ours am: 8724128895 -s ours am: a0d9e59656 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I1a3c0dfc1f9716dc19e1c124e3764ea872fb5d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:39:01 +00:00
Wenhao Wang
2c0fc1cabc [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours am: 7c969539c1 -s ours am: 1d8a119958 -s ours am: 58e3c83314 -s ours am: 626685e5dd -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I7fa7f0e904ac45dd8ba67a134bbfed1dd5cdcd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:38:47 +00:00
Wenhao Wang
064698cd74 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours am: 682b7ec427 -s ours am: 2e934c5d80 -s ours am: 52167fe15d -s ours am: 8dcf17ad16 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I625e4f05df99ab25707d0240a0e71e0add54d8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:38:23 +00:00
Wenhao Wang
c2a8a86218 [automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours am: 2ca23affe0 -s ours am: 38e049a471 -s ours am: 8c7a2ad295 -s ours am: 430cd53c44 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I4174962ba40b112c13b18b3334acea457417ad6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:38:21 +00:00
TreeHugger Robot
3f2358892f [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I1192bdd5e99ad44ef0b74793b5c2148848bb9fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:37:23 +00:00
TreeHugger Robot
314f1bf8d0 Merge "Don't limit carrier text when using large screen" into tm-qpr-dev 2022-11-01 22:19:45 +00:00
Wenhao Wang
a0d9e59656 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours am: 1ce1c06835 -s ours am: 8724128895 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: Ia2a3d758537cdf66d783841bae2e417179c7e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:58:31 +00:00
Wenhao Wang
626685e5dd [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours am: 7c969539c1 -s ours am: 1d8a119958 -s ours am: 58e3c83314 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I46b4bc730e5371db406671561e56c26c8b7b88ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:58:28 +00:00
Evan Laird
b91ae18c40 Merge changes I37ab7767,I13890cdc,Idd5fa020,I6f614d61 into tm-qpr-dev 
* changes:
  [SB refactor] Wire up DataConnectionState to the view model
  [SB refactor] Add connectivity tracking to the mobile pipeline
  [SB refactor] Upgrade most data sources to `StateFlow`
  [SB refactor] Track the default subscription and its connection status
 2022-11-01 21:58:27 +00:00
Wenhao Wang
8dcf17ad16 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours am: 682b7ec427 -s ours am: 2e934c5d80 -s ours am: 52167fe15d -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I010571a6b089f094b76d91687eae52eed2693355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:55:51 +00:00
Wenhao Wang
430cd53c44 [automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours am: 2ca23affe0 -s ours am: 38e049a471 -s ours am: 8c7a2ad295 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I4eb5b43aef0001a66fd4137b4024275b9f0ef825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:55:49 +00:00
TreeHugger Robot
1eeb1758fd Merge "Enable user graularity for lockdown mode" into qt-dev 2022-11-01 21:54:57 +00:00
Matt Sziklay
e480be9300 Merge "Add handle menu to bar type window caption." into tm-qpr-dev 2022-11-01 21:43:35 +00:00
Wenhao Wang
8724128895 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours am: 1ce1c06835 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: Ief4cca70e3d591a686b752de943a19899ec0e6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:23:57 +00:00
Wenhao Wang
58e3c83314 [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours am: 7c969539c1 -s ours am: 1d8a119958 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I4a40f3e157930f48f8c0d9911311a6f893170f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:23:44 +00:00
Wenhao Wang
52167fe15d [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours am: 682b7ec427 -s ours am: 2e934c5d80 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I8317a6ff223b92bfc7ae9440af486404c8b66702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:22:24 +00:00
Wenhao Wang
8c7a2ad295 [automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours am: 2ca23affe0 -s ours am: 38e049a471 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: Ida032277bc41e6fc6b560519b4e6410a0674797c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 21:21:49 +00:00
Matt Casey
954ccbd74e Merge "Enable screenshot processor for teamfood" into tm-qpr-dev 2022-11-01 21:08:33 +00:00
Wenhao Wang
1ce1c06835 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: Ie298e7b7a49277b50d3cc69b206731b22da39f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:55:35 +00:00
Wenhao Wang
1d8a119958 [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours am: 7c969539c1 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I6fa4a1fc786826c4ca44db90a27d9d4cc74ec670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:55:29 +00:00
Wenhao Wang
2e934c5d80 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours am: 682b7ec427 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: If5b28bcfe4efcedfd60786d00c69170dd3647542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:55:12 +00:00
Wenhao Wang
38e049a471 [automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours am: 2ca23affe0 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I10682edb2cecf885da9cea9daedf700f1807c2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:55:04 +00:00
Evan Rosky
73fb86b13e Merge "Transitions can also be aborted after start." into tm-qpr-dev 2022-11-01 20:51:40 +00:00
Steve Elliott
1e18a3f640 Merge "Update usage of deprecated coroutines methods" into tm-qpr-dev 2022-11-01 20:50:01 +00:00
Wenhao Wang
aba2a82d08 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I12ec994282adce697af8d6b796176bc391d9ed2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:23:10 +00:00
Wenhao Wang
7c969539c1 [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: Iba659eee744c1504bbf51bfe6b3332ac12ee3246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:23:07 +00:00
Wenhao Wang
682b7ec427 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: I1e59139b8ffe448c1300af13225cad2083244538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:22:19 +00:00
Wenhao Wang
2ca23affe0 [automerger skipped] Enable user graularity for lockdown mode am: baca9125f1 -s ours am: 90ae61e772 -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history

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

Change-Id: Ia3f1c6ede07c7bd4bc2d3d93b7d49d2620cf4c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 20:22:16 +00:00
Andrew Solovay
55331d3fc9 Merge "docs: Adding note to getPhoneNumber(int)" into tm-dev am: 0471cade5b am: 91f82f9c2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20316842

Change-Id: I0098778582eb8a935e01c9740f7a8aca48782ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 19:55:54 +00:00
Wenhao Wang
08e240c3b1 [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: Ie08cebbafc24f0e5e22b8e057239b5638587c6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 19:53:37 +00:00