Commit Graph

65162 Commits

Author SHA1 Message Date
Beverly
bac38a62ca Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb am: 5704a262b4 am: c8f38888e9
Change-Id: Ia450bf4ad49b8534d9f11034fef54b4d40304397
2020-04-10 20:44:23 +00:00
Beverly
c8f38888e9 Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb am: 5704a262b4
Change-Id: Iefa9e88b12bc93dfa90d63bc0d9eb64a7ca18c2a
2020-04-10 20:25:03 +00:00
Xin Li
cc877d7789 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours am: c6d43dd241 am: b19f478794 am: 696da55407 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie749dbdf9c4041ec14a0265ac846a745fbbdf4d4
2020-04-10 20:06:57 +00:00
Beverly
5704a262b4 Fix padding on DND settings header am: 32f2839703 am: 504f43c8fb
Change-Id: Ib333fab1a5183db2ed7d2059d149863f3a0064ea
2020-04-10 20:06:04 +00:00
Xin Li
696da55407 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours am: c6d43dd241 am: b19f478794
Change-Id: Iedd1e388f88f138cdb538d877a2ec51ff4848687
2020-04-10 19:46:40 +00:00
Beverly
504f43c8fb Fix padding on DND settings header am: 32f2839703
Change-Id: Id37351280a62f1f42727f5707883ad02f80e68cc
2020-04-10 19:43:36 +00:00
Xin Li
b19f478794 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours am: c6d43dd241
Change-Id: I63b961879721198c93248b856c2c5ea8f31e14d8
2020-04-10 19:27:41 +00:00
Xin Li
c6d43dd241 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619 -s ours
am skip reason: subject contains skip directive

Change-Id: I8b7e19ae4736d426d962e53a512774cee54a9be0
2020-04-10 19:07:15 +00:00
Beverly
32f2839703 Fix padding on DND settings header
Test: manual
Fixes: 152974082
Change-Id: Id34db63550ddc2ad89c15830e03bf9782df0a765
2020-04-10 12:30:57 -04:00
TreeHugger Robot
6803dea1a5 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 02a8dc0f65 am: ce877d051b am: 9a0c9e17e0
Change-Id: I7d4c5b630f92d1b8e4936df2af2d9568cc1d1b38
2020-04-10 14:09:43 +00:00
Bonian Chen
c88aecd128 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 9afe77d369 am: 278e5686b2 am: 0f91d1604c
Change-Id: I6e0b84e3d87a124edfe8bc20c597afa5e40f381b
2020-04-10 14:09:07 +00:00
TreeHugger Robot
6587e74da3 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: dde9ab5b62 am: 18709df8b1 am: da4e122b7a
Change-Id: Icea8451ff7b90e5c924dc9215113ee8c7f220186
2020-04-10 14:08:34 +00:00
TreeHugger Robot
9a0c9e17e0 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 02a8dc0f65 am: ce877d051b
Change-Id: Ia9c957f0436701ad98135521dd9625f4def7f79f
2020-04-10 14:08:28 +00:00
Bonian Chen
0f91d1604c Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 9afe77d369 am: 278e5686b2
Change-Id: I89b5b750cecf8a8cb33d66a67b41f6b3fd37b7af
2020-04-10 14:07:25 +00:00
Bonian Chen
5116bba16c Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: 8a5272b307 am: 385dd90371 am: a344e2699d
Change-Id: Ib6b2ec4742844ebc35b40901123cb66b7ece3a6d
2020-04-10 14:06:37 +00:00
TreeHugger Robot
30cd86012a Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 70f0c6a53f am: 8a009ac35d
Change-Id: If31a5ac9df256919696df72de5452e68b914deb3
2020-04-10 14:06:12 +00:00
Bonian Chen
bafd78f16b Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 5a45c3ff77 am: cddf1f341b
Change-Id: I4bfced32a89efbd085c55c5cdb139c2d53838f5b
2020-04-10 14:05:43 +00:00
TreeHugger Robot
da4e122b7a Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: dde9ab5b62 am: 18709df8b1
Change-Id: Id8487779bef8b917b91b0b518a1b0b99319f84e5
2020-04-10 13:46:38 +00:00
Bonian Chen
a344e2699d Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: 8a5272b307 am: 385dd90371
Change-Id: Idb574dde2ad682b0eeb13fcb4381cc421c45d5f4
2020-04-10 13:46:26 +00:00
TreeHugger Robot
ce877d051b Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 02a8dc0f65
Change-Id: I949e560c7286320e5d2137dacd48a6055db480f7
2020-04-10 13:45:48 +00:00
Bonian Chen
278e5686b2 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 9afe77d369
Change-Id: If75fea0d78b51393ab6fbaa478b43a7e19a565a9
2020-04-10 13:45:32 +00:00
TreeHugger Robot
8a009ac35d Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 70f0c6a53f
Change-Id: I20cc11e9c802b6e9324058248f955c3aecdb7255
2020-04-10 13:45:19 +00:00
Bonian Chen
cddf1f341b Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 5a45c3ff77
Change-Id: I217a54b9ae1d65f7a037cc79ccc73eaee5d44026
2020-04-10 13:44:57 +00:00
TreeHugger Robot
02a8dc0f65 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe
Change-Id: I3aea9ae40a75266e29d0daa92646c7fd378d7f6c
2020-04-10 13:20:56 +00:00
TreeHugger Robot
18709df8b1 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: dde9ab5b62
Change-Id: If22d76d1d74e09127448298305ffea22c5ca3f00
2020-04-10 13:20:32 +00:00
Bonian Chen
9afe77d369 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a
Change-Id: I73216639deeb8336aae9515693ea738f1a6278d6
2020-04-10 13:20:30 +00:00
Bonian Chen
385dd90371 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: 8a5272b307
Change-Id: Ia9815d0de9d01c3a362b9d1af75d620887cc240a
2020-04-10 13:20:15 +00:00
TreeHugger Robot
70f0c6a53f Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe
Change-Id: If078432fd8e8ab16653aedf000f6da85b9a7a327
2020-04-10 13:19:21 +00:00
Bonian Chen
5a45c3ff77 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a
Change-Id: I0193370f5b63f92abe6490839a571f0c6c6df422
2020-04-10 13:19:03 +00:00
Bonian Chen
c8c8d7c7f9 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: f407842d32 am: bf8634d08a am: e5495ca369
Change-Id: If63babb06fcc883149fc529bae26b11edbfdc37a
2020-04-10 13:16:38 +00:00
TreeHugger Robot
976b3690fe Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
Change-Id: I0cb34fead8cbcabf7eb01bd058f9604b5c7d19d0
2020-04-10 13:06:21 +00:00
TreeHugger Robot
dde9ab5b62 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
Change-Id: I2cc663ea9aec69848bc96d6dc25e1895984b9731
2020-04-10 12:57:10 +00:00
Bonian Chen
8a5272b307 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
Change-Id: Ib2d9ecedaa764c9ea884f19f2a1db45cf62f9613
2020-04-10 12:56:32 +00:00
Bonian Chen
e5495ca369 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: f407842d32 am: bf8634d08a
Change-Id: If74ec671164a71d5f73b1a5225a94d015a59ed6a
2020-04-10 12:56:12 +00:00
TreeHugger Robot
afaf654a77 Merge "Support click metrics logs in several pages" into rvc-dev 2020-04-10 12:55:10 +00:00
Bonian Chen
b72aa1c03a Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
Change-Id: Iadc2fa5c7e9ab9b15bf3105c303110c4c2c6d99b
2020-04-10 12:55:01 +00:00
Bonian Chen
8e689d770d Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: dc6d9e53d1 am: fd86a33e6e am: 5941bb88bf
Change-Id: I9adc86a019ee0cbf28102bb5eb50b29633bfb725
2020-04-10 12:42:31 +00:00
Bonian Chen
bf8634d08a Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: f407842d32
Change-Id: I06401f6158ea3c02bcbb3f832216124f6e20ff50
2020-04-10 12:42:27 +00:00
Bonian Chen
a8f76bcf8a Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: 1031a3156f am: 570eb70eb1
Change-Id: I2661f8e0d74055fdccfff915fe9deddafb5fdd7f
2020-04-10 12:42:12 +00:00
Bonian Chen
e18904daab Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev 2020-04-10 12:37:42 +00:00
Bonian Chen
5941bb88bf Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: dc6d9e53d1 am: fd86a33e6e
Change-Id: Ib0c22f98de481a2fca6af0be3e1ac4894dc04cf8
2020-04-10 12:23:20 +00:00
Bonian Chen
570eb70eb1 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: 1031a3156f
Change-Id: I3f721e4b3d336a2e1ee34c4833b12014c6623070
2020-04-10 12:23:05 +00:00
Bonian Chen
fd86a33e6e Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: dc6d9e53d1
Change-Id: I9e3642cb2254918e6eeac768bfc55cde21e821d7
2020-04-10 12:14:26 +00:00
Bonian Chen
f407842d32 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796
Change-Id: Idebedd7bb1ba4823b658aa0bc49413d014bb8c29
2020-04-10 12:14:25 +00:00
Bonian Chen
1031a3156f Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796
Change-Id: Ibd2e4ac878c48502f11a90faaad9a800b0ef3551
2020-04-10 12:12:52 +00:00
Bonian Chen
dc6d9e53d1 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
Change-Id: I837ddd16902ad159d5f791c316ba4f962f754640
2020-04-10 11:51:45 +00:00
Bonian Chen
369594d796 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
Change-Id: I9bbe02a684f97e50a66278b725814fc7cd9d4a7b
2020-04-10 11:50:17 +00:00
Bonian Chen
866fa1061c Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev 2020-04-10 11:30:42 +00:00
Bonian Chen
cad93df0a4 [Settings] Avoid rename inactive subscription from NullPointerException
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
(cherry picked from commit 1b71b5e601)
2020-04-10 18:05:17 +08:00
TreeHugger Robot
06b6b969ad Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec am: f702bb94d0 am: 907c0740d5 am: 7e107cac02 am: 689aab245a
Change-Id: Iba9049ce88ef9049ed433e9741714b038294770a
2020-04-10 09:24:54 +00:00