Jason Chiu
c3a57b1549
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0 am: 997aa1dffa
...
Change-Id: Ibfa9dbbdb4c123da3be5a19c56eba609bb0d85db
2020-05-14 08:24:05 +00:00
Jason Chiu
8b9fa9cc01
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 6170f9372e
...
Change-Id: I2cca8c4968d9afd170f12ec40cd603da0998385a
2020-05-14 08:22:51 +00:00
Jason Chiu
0f428f485c
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50 am: 68335164e1
...
Change-Id: I98406cafa3429e4b71a5db70d526b0a4cb770806
2020-05-14 08:22:44 +00:00
Jason Chiu
6170f9372e
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50
...
Change-Id: I8161c7f90ff8645bc9ab83bc91296597fc59803e
2020-05-14 08:11:11 +00:00
Jason Chiu
997aa1dffa
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: a69f270ac0
...
Change-Id: I8a7d1abdd6b270269ea26e26c996e7e3c3ad816d
2020-05-14 08:10:26 +00:00
Jason Chiu
68335164e1
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287 am: f067ac4f50
...
Change-Id: I5204e67ae2f85a6590d87d721481bf6bc5f39241
2020-05-14 08:10:12 +00:00
Jason Chiu
a69f270ac0
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287
...
Change-Id: I95e4190ee4492a892e11d65d413db2443c975c8d
2020-05-14 07:29:02 +00:00
Jason Chiu
f067ac4f50
Merge "Add metrics log for special cases" into rvc-dev am: 60071b9287
...
Change-Id: I6fcbbcb9b1dddfcd2114cfd81ee225bad0fc7e9f
2020-05-14 07:28:56 +00:00
Jason Chiu
60071b9287
Merge "Add metrics log for special cases" into rvc-dev
2020-05-14 07:12:47 +00:00
Automerger Merge Worker
5ca17dfebb
Merge "Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 27a4a17aac am: 8d56f7127d" into rvc-qpr-dev-plus-aosp
2020-05-14 03:56:58 +00:00
TreeHugger Robot
def28e19b3
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 27a4a17aac am: 8d56f7127d
...
Change-Id: I4838ae19352ed31571c4ff8f4cd412e1fbeb209a
2020-05-14 03:56:54 +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
8d56f7127d
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b am: 27a4a17aac
...
Change-Id: I107fe0322769f690fe1e9ddd6fa9a734e4f123ec
2020-05-14 03:43:34 +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
27a4a17aac
Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b
...
Change-Id: Id3005fde29c015152fbc345bd1b8d7fe3d2efd20
2020-05-14 03:32:22 +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
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
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
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
