Lei Yu
fad8cec592
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
2019-05-31 10:41:54 -07:00
Lei Yu
677d5a5e01
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
2019-05-31 10:40:50 -07:00
Lei Yu
ded55a1401
Use new API to build NetworkTemplate
...
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207
Merge "Fix issues in battery usage accounting" into qt-dev
2019-05-31 17:17:51 +00:00
Joel Galenson
2118f8a63f
Revert "Remove Permissions Hub."
...
This reverts commit 1e7c172ad5 .
Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
2019-05-31 07:55:19 -07:00
Joel Galenson
5a9c0f861e
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
...
am: 0709624634
Change-Id: I9ebf8ab89c1bd7cdbb0f46df75cd842dc50a3bee
2019-05-31 06:17:32 -07:00
Joel Galenson
0709624634
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
d8efe209f7
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
zoey chen
3aa9c79341
UE showed wrong title and message when enabling data roaming.
...
It set wrong string when building the roaming dialog.
BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Lucas Dupin
ff5dde9f05
Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32
...
am: d3e686fc33
Change-Id: I067abe881c9ac0f511cf184343c12a6ac74d1e9d
2019-05-30 21:33:17 -07:00
TreeHugger Robot
c0fbb533d2
Merge "Guard NPE when using search view"
2019-05-31 04:27:43 +00:00
Lucas Dupin
d3e686fc33
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
Change-Id: I8c0512ac98aecfb3306ee89e3a4ff1e711f45d89
2019-05-30 21:27:15 -07:00
TreeHugger Robot
1a3112ab32
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
2019-05-31 04:15:54 +00:00
TreeHugger Robot
46a221434b
Merge "Fixed the IllegalStateException on removing account"
2019-05-31 03:04:48 +00:00
tmfang
f841748be3
Guard NPE when using search view
...
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226
Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
Ilya Matyukhin
803630c74b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev am: dbe399a023
...
am: c6f766ec2b
Change-Id: Id1f442fbfbe8d2fe63a7fcb5b4e1bce5dfb7e7bc
2019-05-30 18:15:06 -07:00
Ilya Matyukhin
c6f766ec2b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
2019-05-30 18:10:09 -07:00
TreeHugger Robot
dbe399a023
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
2019-05-31 00:52:11 +00:00
Fan Zhang
5f2d7f841d
Merge "Add slice uri to slice index db"
2019-05-31 00:02:25 +00:00
Fan Zhang
ec81d6121e
Override 2 getSliceUri() instance to return platform slice
...
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Joshua Mccloskey
be79914c4f
Merge "String update." into qt-r1-dev am: b471e2439c
...
am: 9b79a4c902
Change-Id: I310df214301362a841a37f8b8762a9bbae67d7d1
2019-05-30 16:48:58 -07:00
Fan Zhang
f36ca50ec7
Add slice uri to slice index db
...
And slightly refactored the SliceDataConverter to remove 1 reflection.
Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
2019-05-30 16:47:31 -07:00
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
2019-05-30 16:32:47 -07:00
Alex Salo
88e3adce68
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7
...
am: ac7851e1ce
Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
2019-05-30 16:31:17 -07:00
Joshua Mccloskey
b471e2439c
Merge "String update." into qt-r1-dev
2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
2019-05-30 22:59:12 +00:00
Ilya Matyukhin
d59150eca6
Add generateChallenge() in onResume()
...
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
2019-05-30 15:01:22 -07:00
Lucas Dupin
8c29afdc3f
Fix exception on non face-enabled devices
...
Test: open privacy settings page
Bug: 130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2
2019-05-30 14:58:52 -07:00
Julia Reynolds
42c33d0798
Merge "Change notification alert icon" into qt-dev am: 2821456995 am: f5afaffc2c
...
am: 71420a2209
Change-Id: Ifffa09d63f2ff782b199eb4f9ddd065d079b16e6
2019-05-30 14:33:38 -07:00
Julia Reynolds
71420a2209
Merge "Change notification alert icon" into qt-dev am: 2821456995
...
am: f5afaffc2c
Change-Id: I340a6394fece9fe398e92c219b3a186db341001c
2019-05-30 14:22:17 -07:00
Julia Reynolds
72182e1ffc
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
2019-05-30 14:11:52 -07:00
Christine Franks
2adf1f213d
Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d
...
am: 3ccc01ca18
Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
2019-05-30 14:09:41 -07:00
Julia Reynolds
f5afaffc2c
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
2019-05-30 14:08:51 -07:00
TreeHugger Robot
2821456995
Merge "Change notification alert icon" into qt-dev
2019-05-30 20:51:49 +00:00
Christine Franks
3ccc01ca18
Merge "Add SIM color picker" into qt-dev am: b747c5c270
...
am: c1c4a0858d
Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270
Merge "Add SIM color picker" into qt-dev
2019-05-30 20:01:48 +00:00
Julia Reynolds
346c7f7081
Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb am: 9e865f88be
...
am: 9ae4df15fd
Change-Id: Ia4106b40535a25e3315f0e0466dd54b073931bd8
2019-05-30 12:31:03 -07:00
Julia Reynolds
9ae4df15fd
Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
...
am: 9e865f88be
Change-Id: Icd84f4b664f5aaa58cca23c2c89b9a4c3412981d
2019-05-30 12:16:41 -07:00
Julia Reynolds
9e865f88be
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
2019-05-30 12:10:23 -07:00
Julia Reynolds
0a4dce78c1
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: Ia42d67cab34dfb380d5be909f22f717f8ecfd5b6
2019-05-30 12:09:22 -07:00
Adam He
bb10d70e7d
Merge "Profile select only shows with multiple profiles present." into qt-r1-dev am: c9364bffbc
...
am: 65a6dbc797
Change-Id: Id3efe7c862b0fbeccc75f9c68331fd13e6f862a5
2019-05-30 12:09:18 -07:00
TreeHugger Robot
1b25f986cb
Merge "Fix a11y readout of notification importance buttons" into qt-dev
2019-05-30 18:53:57 +00:00
Yi-Ling Chuang
e6ad261335
Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d am: dd7133e523
...
am: abccbcb23b
Change-Id: I499c073afd07b5b468afe2c3146bb0c122949ff5
2019-05-30 11:51:09 -07:00
Julia Reynolds
eeefeebeff
Change notification alert icon
...
Test: manual
Bug: 134054170
Change-Id: Ibd66a55a30ac9fbeb7a32638fe236067c6175bc4
2019-05-30 14:47:07 -04:00
Lei Yu
ebdca63be8
Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: 949c937fce
...
am: 2dd116845a
Change-Id: I8f7c3467362d2e4662c0a7ad9649a2b1ab505c07
2019-05-30 11:44:04 -07:00