Commit Graph

773182 Commits

Author SHA1 Message Date
TreeHugger Robot
f20dc394ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7cd78b1f1c -s ours am: 3d9d479930 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c93d1e6f768d77408d1c6b9da63626981f08810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:10:41 +00:00
Bill Yi
dc930331d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb73eeeb8c -s ours am: 4ad3a6f9cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id30e4397a5cfa00c93f034ce69562c2dbdf4068f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 09:10:22 +00:00
TreeHugger Robot
3d9d479930 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7cd78b1f1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ece273fb6615eec001f4f80b6d54168307abc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 08:15:52 +00:00
Bill Yi
4ad3a6f9cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb73eeeb8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78fe3cb49843424a2bd94ab2198ab0934d3d9361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 08:15:25 +00:00
Automerger Merge Worker
7cbbc84537 Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours" into tm-d1-dev-plus-aosp am: 7ba9b8acaf -s ours
am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e32c is already in history

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

Change-Id: I21a46d973404b2e72ac1dc8261a4637fd163547c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 07:48:53 +00:00
Manjeet Rulhania
3269f16b8d [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours am: f209a63176 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I4273fa109f6cc33ad3748741de9b1c5e8cee4b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 07:48:50 +00:00
Manjeet Rulhania
cb48caad39 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: 61b1109137 -s ours am: fa231df549 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: Id90b7963e1b690ab9e7c5d60ebb6de3f13185339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 07:48:18 +00:00
Manjeet Rulhania
f2fea18755 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours am: 2898af2cca -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: Idfe761523dcdacf201e87ac289044baff5a19108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 07:47:54 +00:00
TreeHugger Robot
7cd78b1f1c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-16 07:38:50 +00:00
Automerger Merge Worker
7ba9b8acaf Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours" into tm-d1-dev-plus-aosp 2022-05-16 06:55:55 +00:00
Manjeet Rulhania
f209a63176 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I0798a60f79ac17d19e947817f29df59131170e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:55:44 +00:00
Manjeet Rulhania
fa231df549 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: 61b1109137 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I57f9865baed5b8523634b7e9e4593b00bba34985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:55:44 +00:00
Manjeet Rulhania
2898af2cca [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours am: ed555dcb96 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: Ie88be779940eb18dabcdcbfb36477a6e816e4ed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:55:41 +00:00
Manjeet Rulhania
ed555dcb96 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I04893098d8a74762f7199c50adb48906188fcd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:56:01 +00:00
Manjeet Rulhania
61b1109137 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: If9594e28ba3cb3d431556338790758a371232b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:54:29 +00:00
Manjeet Rulhania
3972a5c0fc [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: Icbd158a716929aace36992b6242f6219ce6f0d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 05:18:26 +00:00
Wei Sheng Shih
8e8a07531a Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: 79b31eda84 am: 44bd3a7534
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I701edb759d7df47d171ca16383950540d2e4f61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:47:01 +00:00
Wei Sheng Shih
d176ca38e3 Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: ad95d22b9d am: 43d0959d3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: Icc4416fdd5914b3936daf976a49135e3161d72d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:46:52 +00:00
Michael Groover
850bfe43f1 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: f407027f0e am: d362b70ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Ic17d2c5c35bc797d35c9f0eb30f12b8844412c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:46:45 +00:00
Michael Groover
fdc4f1ed7a Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: 7593599cc0 am: 22dd77dfe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: I1cfb7c31d1d736dc9eb6b907adb99613943dd753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:45:26 +00:00
Manjeet Rulhania
8eee1b2826 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I413b039bc4eacb8075fdafa9d67efad0c1159a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:04:51 +00:00
Wei Sheng Shih
2cbfa569a8 Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: ad95d22b9d am: 6cfafc4b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I75733e864d8411f3e193a39399ed579fb0aec192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:04:39 +00:00
Michael Groover
04d2953116 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: 7593599cc0 am: 8b2a14730d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Id42d45670a62edf637232a0037d58601006163b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 04:04:09 +00:00
Wei Sheng Shih
44bd3a7534 Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: 79b31eda84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I925335c03de00c7f190461647f393dedde9d570d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:31 +00:00
Wei Sheng Shih
6cfafc4b2b Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: ad95d22b9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I7e0cbe1713b18456605b17098ea8f3e1edcc4ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:22 +00:00
Wei Sheng Shih
43d0959d3b Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d am: ad95d22b9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I53148d3dd71361bf7a65965b89ad74800199fd30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:13 +00:00
Michael Groover
d362b70ac2 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: f407027f0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: I70bd96409f15e9faa4bf3ab99d1f18595f9be97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:53:05 +00:00
Michael Groover
22dd77dfe7 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: 7593599cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Ib46e6eb64c9039ad0750133e44dccc5de3fcab5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:52:54 +00:00
Michael Groover
8b2a14730d Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 am: 7593599cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Ia2e53a9ade116b8d6ce42a9b882fb0846b15f4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:52:53 +00:00
Riddle Hsu
9b091d2029 Merge "Round screen size of configuration" into tm-qpr-dev am: 044de12a14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320972

Change-Id: I395d5f65cbe621b0a911006dcf0968d9afa87edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:52:01 +00:00
Riddle Hsu
37fa423c02 Merge changes Ibd113f4f,I09c2feff into tm-qpr-dev am: 9605ca616b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18368523

Change-Id: Ia07bb2e94950fa436a76914b439d84fb51bd8dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:51:15 +00:00
Manjeet Rulhania
473bb58e58 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I43d0a123282ac4ddec1643d25a8def016c341096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:25:47 +00:00
Ling Ma
ca6633215b [automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0 am: 6be5b86947 -s ours am: b6abce562d -s ours
am skip reason: Merged-In Ibf74839f688df587d1f791795924a8152c52e3dc with SHA-1 5153e1b7cf is already in history

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

Change-Id: I6c23091880b9ecc722994188e15d4e3ffc5aa0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:24:40 +00:00
Wei Sheng Shih
ad95d22b9d Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I12d47b799a5d5b89f4145830bb02a229a9497706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:18:30 +00:00
Michael Groover
7593599cc0 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: I0e7b559afb5e0551a83b90b08bc5589d1162d635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:17:47 +00:00
Wei Sheng Shih
79b31eda84 Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I70298174734bc1a4439de0c3919c604261dff0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:17:16 +00:00
Michael Groover
f407027f0e Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Iad97767d24c82e1f3e0309e152c4a8c4db38a3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 03:16:42 +00:00
Riddle Hsu
044de12a14 Merge "Round screen size of configuration" into tm-qpr-dev 2022-05-16 03:13:29 +00:00
Riddle Hsu
9605ca616b Merge changes Ibd113f4f,I09c2feff into tm-qpr-dev
* changes:
  Remove client side deferred config for cached state
  Defer sending config change to cached process
2022-05-16 03:12:44 +00:00
Ling Ma
b6abce562d [automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0 am: 6be5b86947 -s ours
am skip reason: Merged-In Ibf74839f688df587d1f791795924a8152c52e3dc with SHA-1 5153e1b7cf is already in history

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

Change-Id: I57f220b58953433077c7e5d7ea520c01905e8a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 02:45:52 +00:00
Manjeet Rulhania
e131598842 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours
am skip reason: skipped by user mrulhania

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

Change-Id: I286b000f30a05ae45d3951b05c6b6253238b46df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 02:18:21 +00:00
Wei Sheng Shih
a688a7499d Merge "Send client relaunch event to WMCore." into tm-dev 2022-05-16 01:55:24 +00:00
Michael Groover
d931f19fb0 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev 2022-05-16 01:36:04 +00:00
Ling Ma
6be5b86947 Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372

Change-Id: I777725fb3a6d52873176d42cfefae43cf39467fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 01:23:24 +00:00
Ling Ma
aa886be6d0 Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372

Change-Id: I5eea47ee7b4c1bcd3537e825da7622fa6a7e2fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 00:49:19 +00:00
Automerger Merge Worker
08650b5aa8 Merge "Merge "SELinux labels bug logging and workaround" into tm-dev am: a9cdc4a888 am: 8063d3ad8a" into tm-d1-dev-plus-aosp am: 31bfc4c8e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281657

Change-Id: If90b6fdf315f0e01983ca8dd04b65a9920e5253d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 00:39:28 +00:00
Yurii Zubrytskyi
f87816661f Merge "SELinux labels bug logging and workaround" into tm-dev am: a9cdc4a888 am: bba4188a23 am: 842d6c3e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281657

Change-Id: I69eae25434d029a55febb249022f243238669ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 00:38:57 +00:00
Yurii Zubrytskyi
18e843a210 Merge "SELinux labels bug logging and workaround" into tm-dev am: a9cdc4a888 am: 8063d3ad8a am: 15f33649a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281657

Change-Id: If619bbff04307e487311148b7e49773d18dc8979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 00:38:34 +00:00
Ling Ma
ecb5d530c2 Merge "Make registrationState consistent with RoamType in case of override" 2022-05-15 23:56:31 +00:00
Automerger Merge Worker
31bfc4c8e7 Merge "Merge "SELinux labels bug logging and workaround" into tm-dev am: a9cdc4a888 am: 8063d3ad8a" into tm-d1-dev-plus-aosp 2022-05-15 23:30:06 +00:00