Commit Graph

673578 Commits

Author SHA1 Message Date
TreeHugger Robot
33f43d5bc8 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: eb9b01e0a9 am: 18afd0b62b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: Id40fdb8522a5c852476333b9dfaf89275b4956a8
2021-09-30 00:49:40 +00:00
TreeHugger Robot
248bea371d Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: 2f64defeb4 am: 3a9eb555b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: Ia63deb06662330dd714e366726734f44427c3353
2021-09-30 00:49:13 +00:00
TreeHugger Robot
aaca458b97 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: eb9b01e0a9 am: 291d4631a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I807cb7a772dcdd01a911a27bf5793f690e65ddea
2021-09-30 00:41:29 +00:00
Jerry Chang
13764ef308 Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev am: 8366d0347c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926304

Change-Id: I058fed0a06af23064106c64e62edf19b26bc982e
2021-09-30 00:40:56 +00:00
TreeHugger Robot
18afd0b62b Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: eb9b01e0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: Ib5b4a311a64fa02937d7dabb288038015792e9ea
2021-09-30 00:36:54 +00:00
TreeHugger Robot
291d4631a7 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: eb9b01e0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I4527586e27b4897f5e57c3c52cac151e83dc0409
2021-09-30 00:36:54 +00:00
TreeHugger Robot
3a9eb555b8 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82 am: 2f64defeb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I3f48e29dd60b6aa2a7bb4fb7e26d73553116c758
2021-09-30 00:36:35 +00:00
Jerry Chang
8366d0347c Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev 2021-09-30 00:29:46 +00:00
TreeHugger Robot
eb9b01e0a9 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I5d74631545693a8b92c0d534b29046856fbfece0
2021-09-30 00:24:19 +00:00
TreeHugger Robot
2f64defeb4 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24 am: c46a977d82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: If5443a8c72311fe58f8bc75164a9c3f4da3861a2
2021-09-30 00:23:13 +00:00
Suprabh Shukla
0708411189 Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af am: 23315f8003 am: fefc7f08be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I00953ab4617fb631f792694e43376c67f421e705
2021-09-30 00:13:12 +00:00
TreeHugger Robot
2c97abe3eb Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev am: e9226e8f46 am: 3cd4616abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15905687

Change-Id: I25cd2d8afd20df24ecac824dc4506e3cf39aadc1
2021-09-30 00:12:52 +00:00
TreeHugger Robot
3bf46cdd75 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev am: 94eecf4e07 am: 8e954f6a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878932

Change-Id: Ifdde56dc1e683f8712b48b5a9441554b7bedf464
2021-09-30 00:12:16 +00:00
TreeHugger Robot
c46a977d82 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev am: c2c72dae24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878933

Change-Id: I9030e8cced0b2b9879b377d9f3e62aed50022ccb
2021-09-30 00:11:52 +00:00
Suprabh Shukla
fefc7f08be Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af am: 23315f8003
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I207038219be0fdbd84454a8c8d1cce3b052f8a12
2021-09-30 00:11:45 +00:00
TreeHugger Robot
c895a4763e Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev am: e9226e8f46 am: 35bcf44342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15905687

Change-Id: I00d9036a952f276d4f7544159e883eea57347613
2021-09-30 00:08:31 +00:00
TreeHugger Robot
05f73e88f3 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev am: 94eecf4e07 am: fc0548f5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878932

Change-Id: Id6b79528ee54a228ef602247ff2703eca2ad3aa2
2021-09-30 00:08:17 +00:00
TreeHugger Robot
fa8f224416 Merge "Fix serialization bug in GpsNavigationMessage" into sc-v2-dev am: d56d1a4152
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878931

Change-Id: Ib89af127de4218fba121c693603e15562d280ab1
2021-09-30 00:07:19 +00:00
TreeHugger Robot
3cd4616abe Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev am: e9226e8f46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15905687

Change-Id: I0739d826b5250deb9a35b0b44de45b106318ac06
2021-09-30 00:04:10 +00:00
TreeHugger Robot
35bcf44342 Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev am: e9226e8f46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15905687

Change-Id: I25e54f6898af8017ba550d941e9fc967ff390f9a
2021-09-30 00:03:56 +00:00
TreeHugger Robot
fc0548f5fa Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev am: 94eecf4e07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878932

Change-Id: Ie47594cfda41ae6d41aabb7b152b6d76b3f9168e
2021-09-30 00:03:19 +00:00
TreeHugger Robot
8e954f6a82 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev am: 94eecf4e07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878932

Change-Id: I22115bcd70f730cc174ed858368bbcbf15b117d5
2021-09-30 00:03:18 +00:00
TreeHugger Robot
c2c72dae24 Merge "Fix serialization bug in GpsNavigationMessage" into rvc-qpr-dev 2021-09-30 00:01:09 +00:00
Suprabh Shukla
23315f8003 Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: I501853427878fa4ea0e227ec1b00ac7c831b5291
2021-09-29 23:59:17 +00:00
TreeHugger Robot
e9226e8f46 Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev 2021-09-29 23:58:52 +00:00
TreeHugger Robot
d56d1a4152 Merge "Fix serialization bug in GpsNavigationMessage" into sc-v2-dev 2021-09-29 23:54:41 +00:00
TreeHugger Robot
94eecf4e07 Merge "Fix serialization bug in GpsNavigationMessage" into sc-qpr1-dev 2021-09-29 23:49:38 +00:00
Suprabh Shukla
694cf0f6af Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: Iea902e93f038cd3a06d63cf6c6cdd149c873df79
2021-09-29 23:39:49 +00:00
Suprabh Shukla
17a7d79ff4 Merge "Redact key value from log when DEBUG is false" 2021-09-29 23:25:21 +00:00
TreeHugger Robot
e10d87b485 Merge "Add multi-user jank monitoring" into sc-v2-dev am: 89f022ac99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15891027

Change-Id: I8f5811c0f3d625c13422a9bcb050295bf7789368
2021-09-29 22:42:20 +00:00
TreeHugger Robot
89f022ac99 Merge "Add multi-user jank monitoring" into sc-v2-dev 2021-09-29 22:31:47 +00:00
Lucas Dupin
923be59249 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: af936c0ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303

Change-Id: Id5fabe2f2f378c5dd3ec7d3b643d349440685a9e
2021-09-29 22:04:14 +00:00
Lucas Dupin
27458498aa Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: ef35ff2146
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303

Change-Id: Ib080f70fbc31aa7b4d1dc98886e515c0e68e875b
2021-09-29 22:03:52 +00:00
Lucas Dupin
ef35ff2146 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303

Change-Id: I59138d29458b23ad980ac5a8418cc168e3c50d4d
2021-09-29 21:54:12 +00:00
Lucas Dupin
af936c0ce1 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303

Change-Id: I561df3f5a26ba3945d223bac3e9407810d3343d1
2021-09-29 21:54:10 +00:00
Lucas Dupin
48647682a0 Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev 2021-09-29 21:38:53 +00:00
Brad Ebinger
cd91a0f9f4 [automerger skipped] Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc am: b26396ab94 am: 48942a0a6c -s ours
am skip reason: Merged-In Id7b16d75c512106b56cb49974570811679498a0b with SHA-1 79bc4faa83 is already in history

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

Change-Id: I0db444a5479252c3edf598bcec0cf8e7bfc823f6
2021-09-29 19:17:48 +00:00
Automerger Merge Worker
2c5687288e Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours" into sc-qpr1-dev-plus-aosp am: 27ffbed7f8 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 46fff422b4 is already in history

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

Change-Id: I2d0aac99723ccb1dbf25eb2a3f044c3c3ffbd4a5
2021-09-29 19:17:22 +00:00
Automerger Merge Worker
c9a8674ecb Merge changes from topic "am-242e7057c303476d9bf9b440aeb2b9a6" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours am: 258a30ee51 -s ours
  [automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours am: 1730e32644 -s ours
2021-09-29 19:16:00 +00:00
Brad Ebinger
48942a0a6c Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc am: b26396ab94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I8fcf0b9e866840486cd409d67bdcdb6036379546
2021-09-29 19:15:10 +00:00
TreeHugger Robot
b1914a79fe [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours am: c22056bba2 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: I1f8a7352f1d724bf1ac889e24d8e2cb925bf7332
2021-09-29 19:14:45 +00:00
TreeHugger Robot
4af6bb4c54 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours am: 258a30ee51 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: Ia7b4167fe670a65c260276966d23e963068275c4
2021-09-29 19:14:27 +00:00
Long Ling
2315e6e7ab [automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours am: 1730e32644 -s ours
am skip reason: Merged-In I37b5b05a363a3d4f2ed3626109206863b664ba66 with SHA-1 f1b1ef1c38 is already in history

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

Change-Id: I965d040b6d8f56c810ae513076861eaebb098c48
2021-09-29 19:14:13 +00:00
Brad Ebinger
b26396ab94 Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: Icd10f46cfaa00ff940a82d54e4cde2d283930a5f
2021-09-29 18:45:11 +00:00
Automerger Merge Worker
27ffbed7f8 Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours" into sc-qpr1-dev-plus-aosp 2021-09-29 18:41:13 +00:00
TreeHugger Robot
258a30ee51 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: Idf8bba938b244e016bdd1f674a6c737e86611466
2021-09-29 18:40:44 +00:00
Long Ling
1730e32644 [automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours
am skip reason: Merged-In I37b5b05a363a3d4f2ed3626109206863b664ba66 with SHA-1 f1b1ef1c38 is already in history

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

Change-Id: I3c2ac19da865619f7cdc8cfc4bd2cd1d24ace380
2021-09-29 18:40:42 +00:00
TreeHugger Robot
bf1303a375 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: I7b6756de3c4a78be4711a8e0e52abcafe4a130b2
2021-09-29 18:40:33 +00:00
TreeHugger Robot
c22056bba2 [automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history

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

Change-Id: Iabf142a9d4c5d2e5152042cab91b440219f455d7
2021-09-29 18:40:31 +00:00
Brad Ebinger
e211df78dc Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I00bf7a8ddc67cd819e16776b9ec62bfe72bb3db6
2021-09-29 18:31:25 +00:00