Commit Graph

723539 Commits

Author SHA1 Message Date
Pedro Loureiro
19a969e52c Merge "Parse new xml attributes used for updatable shared libraries" 2021-09-30 18:21:14 +00:00
Sam Gilbert
e971f8d12c Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e am: 12da16335e am: c17751421a am: f56195ac0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: I7ff844cac42f7734b27f3f84a68999ea3a6e864c
2021-09-30 18:02:59 +00:00
Jason Chang
60ac9b7916 Merge "Fix switching "Swipe down from Show notification" to "Pull screen into reach" will not able to trigger it at first time" into sc-v2-dev am: 323e305540 am: af394e05a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938345

Change-Id: I5fb8fa03d8b627b963e9a19345894eafbdfea58d
2021-09-30 18:02:12 +00:00
Caitlin Cassidy
90521bffba Merge "[Status Bar Refactor] Move some PanelView setters + getters into PanelViewController and out of PanelBar." into sc-v2-dev am: 837ed2be5a am: e41d00bc66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854191

Change-Id: I87d1c5a1d8415b0addcec034342565c706eb7c9c
2021-09-30 18:01:20 +00:00
Sam Gilbert
f56195ac0f Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e am: 12da16335e am: c17751421a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: I8d665456425127c9845ae8ae03995ad4254e8457
2021-09-30 17:59:55 +00:00
Jason Chang
af394e05a3 Merge "Fix switching "Swipe down from Show notification" to "Pull screen into reach" will not able to trigger it at first time" into sc-v2-dev am: 323e305540
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938345

Change-Id: Ia6babeacdce7368422c1cc194ad58aeaa7e38006
2021-09-30 17:46:58 +00:00
Jason Chang
323e305540 Merge "Fix switching "Swipe down from Show notification" to "Pull screen into reach" will not able to trigger it at first time" into sc-v2-dev 2021-09-30 17:43:32 +00:00
Sam Gilbert
c17751421a Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e am: 12da16335e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: I19a572cd3767746546c7f5c02bbb3b1d9481303a
2021-09-30 17:42:14 +00:00
Caitlin Cassidy
e41d00bc66 Merge "[Status Bar Refactor] Move some PanelView setters + getters into PanelViewController and out of PanelBar." into sc-v2-dev am: 837ed2be5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854191

Change-Id: Ib84e1eb5224f02d4835ea8f420aba8d19729b70a
2021-09-30 17:41:55 +00:00
Sam Gilbert
12da16335e Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: Id0ce4059b6f9e05a335a117c2cc3947adb24d27a
2021-09-30 17:33:08 +00:00
Caitlin Cassidy
837ed2be5a Merge "[Status Bar Refactor] Move some PanelView setters + getters into PanelViewController and out of PanelBar." into sc-v2-dev 2021-09-30 17:26:45 +00:00
Sam Gilbert
182a0a144e Merge "Fix writeToParcel parameter nullability" am: 55fb62a515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: Ieabc166af0086501cc638cffa7dc6f5960f67172
2021-09-30 17:24:46 +00:00
Sam Gilbert
55fb62a515 Merge "Fix writeToParcel parameter nullability" 2021-09-30 17:08:19 +00:00
Automerger Merge Worker
7fe37e0441 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: cfe920a586 -s ours" into sc-v2-dev-plus-aosp am: 58091ed345 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 ced3af1e05 is already in history

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

Change-Id: Id0ad4334a323efa4a63e8f9f511eb193b0175a6b
2021-09-30 17:04:19 +00:00
Automerger Merge Worker
d05a88fb90 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: 7af338bd58 -s ours" into sc-v2-dev-plus-aosp am: d3ddf8cfc3 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 ced3af1e05 is already in history

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

Change-Id: I101bb07b9b31dd841d16496fd58da607fa7b938f
2021-09-30 17:03:49 +00:00
Quang Luong
8135473985 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours am: 544e78a278 -s ours am: 2fdb529cff -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Iaab677cc3f3a6bbf3805d859cb817526d4bd52fe
2021-09-30 17:03:28 +00:00
Automerger Merge Worker
57b56e9de2 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours am: 9cbe7b23fe -s ours" into sc-v2-dev-plus-aosp am: 6c94b0010b -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 ced3af1e05 is already in history

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

Change-Id: I78cdd870be3259146224f86a4c145748824ddd48
2021-09-30 17:03:08 +00:00
Quang Luong
71f8b849aa [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: c7ea3fec1c -s ours am: 53d815844e -s ours am: 497e7dccf1 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Iba7c877fbdd28c45beb97064ff4f5faa59734e25
2021-09-30 17:02:12 +00:00
Quang Luong
eacefeda5b [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: 4980fa4324 -s ours am: b3ed402612 -s ours am: 0f16516df4 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I13411966e82d679fb0a912173d370b88ca8f1882
2021-09-30 17:01:04 +00:00
Automerger Merge Worker
58091ed345 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: cfe920a586 -s ours" into sc-v2-dev-plus-aosp 2021-09-30 16:49:45 +00:00
Automerger Merge Worker
d3ddf8cfc3 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: 7af338bd58 -s ours" into sc-v2-dev-plus-aosp 2021-09-30 16:49:42 +00:00
Quang Luong
4c5e5a617f [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: cfe920a586 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I7f68e8948dbdb7f2d424d0c9bb987ee619144330
2021-09-30 16:49:42 +00:00
Quang Luong
98bce00314 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours am: 7af338bd58 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I5070e07026193873f57da8bf2d620a59b84c931e
2021-09-30 16:49:34 +00:00
Quang Luong
2fdb529cff [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours am: 544e78a278 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I0ec82ffc9ac743c0a697e011f03a327152ddb316
2021-09-30 16:49:30 +00:00
Automerger Merge Worker
6c94b0010b Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours am: 9cbe7b23fe -s ours" into sc-v2-dev-plus-aosp 2021-09-30 16:49:29 +00:00
Quang Luong
497e7dccf1 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: c7ea3fec1c -s ours am: 53d815844e -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Id75c41a56ff4a95c7c18334c3cb23dbafcda0b78
2021-09-30 16:49:23 +00:00
Quang Luong
2ddded1170 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours am: 9cbe7b23fe -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I1b279f1297ba2f79138ca64667b083044fdf4caf
2021-09-30 16:49:14 +00:00
Quang Luong
0f16516df4 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: 4980fa4324 -s ours am: b3ed402612 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ia0c3080a349f1d3a10ddba4520ee5b8cb933de7d
2021-09-30 16:48:39 +00:00
Quang Luong
52b4bcebf6 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 812e82aad2 -s ours am: d2ffae2c3d -s ours am: 61742eded7 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I55e95c667932473777897acb299059bd9c937e8a
2021-09-30 16:33:07 +00:00
Quang Luong
e01a345206 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: fa2173e9d9 -s ours am: 1d7d2d4c03 -s ours am: e38b8f6932 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: Ib5e51195e431b4d22fd45d86e4b4f3368f9371c5
2021-09-30 16:32:44 +00:00
Quang Luong
1e3f625003 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 7a215dcffa -s ours am: e19ce0039d -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I85930acfdae6698d87a98de189dcaae9bd672753
2021-09-30 16:32:23 +00:00
Quang Luong
cfe920a586 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Iaa271b5fd636329b2f122bd31f29bb14915b443e
2021-09-30 16:32:15 +00:00
Automerger Merge Worker
58de2a302d Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours am: c5473dca61 -s ours am: a9c3d8674c -s ours" 2021-09-30 16:32:11 +00:00
Quang Luong
7af338bd58 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4244415853 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ib921269fd1571bf59589f7391669dbb33076b79a
2021-09-30 16:32:02 +00:00
Automerger Merge Worker
61f1b2883f Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4921999c6e -s ours" 2021-09-30 16:32:01 +00:00
Quang Luong
4a84757161 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours am: c5473dca61 -s ours am: a9c3d8674c -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I00a425a3530a818f7aa768bbb86cad77de50688e
2021-09-30 16:31:59 +00:00
Quang Luong
544e78a278 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I483f7ab898e9adf9aa45f569bdafd78854baa58d
2021-09-30 16:31:52 +00:00
Quang Luong
9cbe7b23fe [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: be93997135 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ibd8212c9e7b11f579d8983c7c07bab9108c41528
2021-09-30 16:31:51 +00:00
Quang Luong
9f3b37a159 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: 4921999c6e -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I3c6d90c98221baba0f53a9c706f1d5b58ae06617
2021-09-30 16:31:49 +00:00
Automerger Merge Worker
f755450f16 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 22c4a43eba -s ours am: 090d3dfd8a -s ours" 2021-09-30 16:31:48 +00:00
Quang Luong
53d815844e [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: 7190d9a4e3 -s ours am: 45eda655d7 -s ours am: c7ea3fec1c -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ia79c6091224395f037949acc3e4b07d358b993af
2021-09-30 16:31:45 +00:00
Automerger Merge Worker
5c70d95032 Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: 10fd3d27cf -s ours" 2021-09-30 16:31:43 +00:00
Quang Luong
59c646a36e [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 22c4a43eba -s ours am: 090d3dfd8a -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ic17e386fbc2cb47df194d07f7c0a44c217c8de4e
2021-09-30 16:31:31 +00:00
Quang Luong
b3ed402612 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: 4980fa4324 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I2f5e86579a8c085f5523ebb6eb2f36e704f9dbf3
2021-09-30 16:31:30 +00:00
Quang Luong
74a4788391 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours am: 2f5b9f555f -s ours am: ce8aeb115c -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I3a9d2570b22d98e668019911bc78b87186e27789
2021-09-30 16:31:08 +00:00
Quang Luong
e63bb422d0 [automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a7219 am: 72c56e2c88 -s ours am: b1cc7299a8 -s ours am: e30ae20fcc -s ours am: 22e168245a -s ours am: 10fd3d27cf -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I45cbe3cf785e77cfbc8a4b5e0e1bef11a4014206
2021-09-30 16:31:07 +00:00
Quang Luong
61742eded7 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 812e82aad2 -s ours am: d2ffae2c3d -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I5fbac99fb412d4ba716a3da32fb6a229d24c3804
2021-09-30 16:22:50 +00:00
Quang Luong
e38b8f6932 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: fa2173e9d9 -s ours am: 1d7d2d4c03 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I5455137b972719cc33ec7b6d5fa41a651a2c3623
2021-09-30 16:22:42 +00:00
Quang Luong
e19ce0039d [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 7a215dcffa -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Id9891ec44a5957a117d596e05a6e6c4af6e6264f
2021-09-30 16:22:31 +00:00
Quang Luong
a9c3d8674c [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours am: c5473dca61 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I9d9377954e014b3076aee2284340918d547b8066
2021-09-30 16:21:55 +00:00