Automerger Merge Worker
b5f642e943
Merge "Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 am: f40c91acf1" into rvc-qpr-dev-plus-aosp am: 1a70c3c566
...
Change-Id: I73b1d6c9cd7e0482da8ad8c8e5d84efdd0f9bc47
2020-05-14 04:12:44 +00:00
TreeHugger Robot
a6d61e1c4c
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 am: d034853465 am: df7952192a
...
Change-Id: I959e633d5bf9a6bfb969c3a935d8c6917e6eb18f
2020-05-14 04:12:06 +00:00
Automerger Merge Worker
1a70c3c566
Merge "Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 am: f40c91acf1" into rvc-qpr-dev-plus-aosp
2020-05-14 03:56:53 +00:00
TreeHugger Robot
4ce7dda51e
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 am: f40c91acf1
...
Change-Id: Ie4646c5fd14551a2bdb45b89bdc0bb504e308121
2020-05-14 03:56:48 +00:00
TreeHugger Robot
df7952192a
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2 am: d034853465
...
Change-Id: Ic9b0d693f0e3cf0076769067c7552755d57c42ae
2020-05-14 03:56:40 +00:00
TreeHugger Robot
f40c91acf1
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2
...
Change-Id: I738472f89f8d0d8135f957160922c2d192c81eae
2020-05-14 03:43:23 +00:00
TreeHugger Robot
d034853465
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 35c1670be2
...
Change-Id: I944b56d97a8f73ca9408b951bbc24613fd87879d
2020-05-14 03:42:57 +00:00
TreeHugger Robot
35c1670be2
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b
...
Change-Id: I97a73c098c57975aead1e70a57accba636a782fd
2020-05-14 03:32:17 +00:00
TreeHugger Robot
bb7a65a19b
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev
2020-05-14 03:16:51 +00:00
tim peng
ce9d8c2963
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e am: 2859b646e6 am: bef6dd3c0c
...
Change-Id: Ib6f5694e1eaee363af6d8a095c7e95a19bc66c8b
2020-05-14 02:31:42 +00:00
tim peng
5c4acdde41
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae am: 619ec3ac1b am: faa05525f7
...
Change-Id: I75d48d005ca773d3a9a6d2a0aeb4a4e683102ed0
2020-05-14 02:31:31 +00:00
tim peng
bef6dd3c0c
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e am: 2859b646e6
...
Change-Id: I95a081b95bc649b7266fa22320c5f80759329654
2020-05-14 02:12:46 +00:00
tim peng
faa05525f7
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae am: 619ec3ac1b
...
Change-Id: Idda7e75fda8bdfbc14bfb91cdb4be16cf8eb3b00
2020-05-14 02:11:53 +00:00
tim peng
38d1f44b39
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 76542c7513 am: d53fdb3dc1 am: a447d82f45
...
Change-Id: Icfef426662637222c17308d0a1896c9421e4ef6f
2020-05-14 02:10:04 +00:00
Automerger Merge Worker
9c5d1c195d
Merge "Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e" into rvc-d1-dev-plus-aosp am: a4dd00a45e am: 6c51001c11
...
Change-Id: I1ad5b35496defc482d2ae1f98b75adbc40fc1a2a
2020-05-14 02:09:44 +00:00
tim peng
ff131b2d2f
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: cbabf1874f am: 8ad37d1d69 am: 820de6a6f6
...
Change-Id: Ic0d19a5929d62731e099aa283bc9e40dd42f99ed
2020-05-14 02:09:25 +00:00
tim peng
f55460293c
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae am: d37e97a3c1 am: dcde280030
...
Change-Id: I9e451cf48a7a98a2f892852753390723ca7cf8ad
2020-05-14 02:09:08 +00:00
tim peng
a447d82f45
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 76542c7513 am: d53fdb3dc1
...
Change-Id: I253b168f2509c42d627b5b6faa7a1afd46d55fcf
2020-05-14 02:02:16 +00:00
Automerger Merge Worker
6c51001c11
Merge "Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e" into rvc-d1-dev-plus-aosp am: a4dd00a45e
...
Change-Id: Iaa6d422e6e749246d5caf7968c2963d4fd39ecfd
2020-05-14 02:01:59 +00:00
tim peng
820de6a6f6
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: cbabf1874f am: 8ad37d1d69
...
Change-Id: I22eba49634355988637dda57fcacbd21493bdf57
2020-05-14 02:01:11 +00:00
tim peng
dcde280030
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae am: d37e97a3c1
...
Change-Id: I1834aa468628ad39840852ffb82c88fe98e97517
2020-05-14 02:01:03 +00:00
tim peng
d53fdb3dc1
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 76542c7513
...
Change-Id: I4871b74f58ca0f7e9078794e330b1e7135d79572
2020-05-14 02:00:12 +00:00
tim peng
2859b646e6
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e
...
Change-Id: Iedcc58d9250b3e3421d7785e52993efbf3010943
2020-05-14 02:00:04 +00:00
tim peng
619ec3ac1b
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae
...
Change-Id: I26547899b8e7971a9a062566f73591717f13ce55
2020-05-14 01:59:49 +00:00
Automerger Merge Worker
a4dd00a45e
Merge "Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e" into rvc-d1-dev-plus-aosp
2020-05-14 01:59:41 +00:00
tim peng
8ad37d1d69
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: cbabf1874f
...
Change-Id: I4d970bab9bd75d7d74ccb6f3d7b304adf32705f8
2020-05-14 01:59:24 +00:00
tim peng
de76affbde
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33 am: 6ca2cc572e
...
Change-Id: I59f24e15319f9f87432b7cb13446fe29f2e6de04
2020-05-14 01:59:22 +00:00
tim peng
d37e97a3c1
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620 am: 1aa407bbae
...
Change-Id: Ic0a8dd09da86aa006b2b99703aeeef8ab6db968c
2020-05-14 01:59:05 +00:00
tim peng
76542c7513
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33
...
Change-Id: I90f4c889d939675fa0d66e4003c34248ca170c8b
2020-05-14 01:47:09 +00:00
tim peng
6ca2cc572e
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 8d2c8f1f33
...
Change-Id: I4403bc7f8b208a62751c37edd081c3230c225d3a
2020-05-14 01:47:06 +00:00
tim peng
cbabf1874f
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620
...
Change-Id: I3c8d116a47fde5260d1311cb7db4ce0858afbe5c
2020-05-14 01:46:47 +00:00
tim peng
1aa407bbae
Merge "Refine layout for output switcher panel" into rvc-dev am: 4439bcf620
...
Change-Id: I3fe57bbd3ac00c00f6541d6fe7ab41dfcd6bc7be
2020-05-14 01:46:38 +00:00
tim peng
8d2c8f1f33
Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev
2020-05-14 01:35:44 +00:00
tim peng
4439bcf620
Merge "Refine layout for output switcher panel" into rvc-dev
2020-05-14 01:35:26 +00:00
TreeHugger Robot
1621d6299b
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 0fdf2b6ec3 am: 3c0ca30224 am: 656ed3da3a
...
Change-Id: I12dc4afb6b807297518cb689b6ed445ad3825b18
2020-05-13 21:12:24 +00:00
Automerger Merge Worker
13957ce2c2
Merge "Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88 am: bc4a7705b1" into rvc-qpr-dev-plus-aosp am: 2eb4caccb5
...
Change-Id: Ic8df080f110f22d5d36a97305bfb656d2207dadd
2020-05-13 21:12:16 +00:00
TreeHugger Robot
4fbaf34874
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88 am: 52cb4e8db9 am: 14ecad4f27
...
Change-Id: I62998155d031f4da86da719a52700183b885003f
2020-05-13 21:11:58 +00:00
TreeHugger Robot
656ed3da3a
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 0fdf2b6ec3 am: 3c0ca30224
...
Change-Id: Ic4c25dd8d165d7476d8af5179a8923d497ace896
2020-05-13 20:57:31 +00:00
Automerger Merge Worker
2eb4caccb5
Merge "Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88 am: bc4a7705b1" into rvc-qpr-dev-plus-aosp
2020-05-13 20:57:06 +00:00
TreeHugger Robot
14ecad4f27
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88 am: 52cb4e8db9
...
Change-Id: Ic024d15e7ccadef8b9bef273311d56c7c7c8c5dc
2020-05-13 20:56:57 +00:00
TreeHugger Robot
0d1a8ba094
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88 am: bc4a7705b1
...
Change-Id: I4c572e4cde22cdf77e94e3f24ccebad673995727
2020-05-13 20:56:57 +00:00
TreeHugger Robot
3c0ca30224
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 0fdf2b6ec3
...
Change-Id: I47c8da8751f695931d7b324f6baf336d5f0c1e07
2020-05-13 20:39:08 +00:00
TreeHugger Robot
bc4a7705b1
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88
...
Change-Id: Ic00bc6b5b5643c1fc82973dbef9276658baf718a
2020-05-13 20:38:59 +00:00
TreeHugger Robot
52cb4e8db9
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa am: 08686a1d88
...
Change-Id: I6b65c34d6a3719b2eea6142ca37fd6e841732a54
2020-05-13 20:38:56 +00:00
TreeHugger Robot
08686a1d88
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa
...
Change-Id: Ia13f617854a1c23134040ba726f0ad033025529a
2020-05-13 20:24:39 +00:00
TreeHugger Robot
0fdf2b6ec3
Merge "Remove divider after last items" into rvc-dev am: abeb1a09fa
...
Change-Id: Ia007a992d8fc8f9dee0adbde645e1ea698014b19
2020-05-13 20:24:38 +00:00
TreeHugger Robot
abeb1a09fa
Merge "Remove divider after last items" into rvc-dev
2020-05-13 20:01:52 +00:00
Nate Myren
8c7c22d4b9
Add null check for intent in AppPermissionPreferenceController
...
Sometimes, the App Info page can be reached without an intent in tests.
Add a null check to catch this
Bug: 154650244
Test: atest AppPermissionPreferenceControllerTest#handlePreferenceTreeClick_shouldStartManagePermissionsActivity
Change-Id: I514acda6b78d9e76b230aa945067bd7d6d9feff9
2020-05-13 13:00:53 -07:00
Julia Reynolds
9a6e7329be
Remove divider after last items
...
Fixes: 155890866
Test: manual
Change-Id: Ie0e3f7ad8c1868bda7623718dd60926c300fa353
2020-05-13 14:03:40 -04:00
Automerger Merge Worker
0e5f89c4e9
Merge "[Settings] Avoid from redraw UI when first time onResume am: 17ad56b3fc am: 0c16b3541d am: b83b968ec0" into rvc-qpr-dev-plus-aosp am: 2250dae3e9
...
Change-Id: If1f186841d22c1cb523ca7a69eca6834f0bf5055
2020-05-13 14:33:53 +00:00
