Charles Chen
a8eb5da27e
Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567 am: c1ee356ca6 am: ab67c20603 am: 6eac042d97
...
Change-Id: I2e4b08ed2e61a9e0039619341f83e3a573a2b5e4
2020-05-30 07:40:50 +00:00
Charles Chen
6eac042d97
Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567 am: c1ee356ca6 am: ab67c20603
...
Change-Id: Id15422d161d026e8d8f677fbda8022b012e34a8e
2020-05-30 07:25:47 +00:00
Automerger Merge Worker
fe84655c2e
Merge "Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f am: cfe14d9f64" into rvc-qpr-dev-plus-aosp am: 0f85d40dba
...
Change-Id: I9b7c02ac4626326325a2b02c8fadafe9370aa256
2020-05-30 07:12:50 +00:00
Automerger Merge Worker
0b635da1f6
Merge "Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f" into rvc-d1-dev-plus-aosp am: d302e84497 am: 9aff7bc75c
...
Change-Id: I5be1f111703bdff960a2e5103f017cb0a9bdb557
2020-05-30 07:12:25 +00:00
Charles Chen
ab67c20603
Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567 am: c1ee356ca6
...
Change-Id: I3439185307f11b96449886d60754928487b39bb9
2020-05-30 07:11:45 +00:00
Jing Ji
38919b4858
Add proper lock to the dropbox throttling map am: 3862660dea am: 6ac4335897 am: da12c6a191 am: 6c6c34b40a
...
Change-Id: Ib1946c984c7b996a09f9174b481f92f24f621455
2020-05-30 07:11:44 +00:00
Automerger Merge Worker
0f85d40dba
Merge "Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f am: cfe14d9f64" into rvc-qpr-dev-plus-aosp
2020-05-30 06:51:55 +00:00
Charles Chen
c1ee356ca6
Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567
...
Change-Id: Ibdb1cea64d43db5b54b5905ee544b6e374fe60ff
2020-05-30 06:51:42 +00:00
Automerger Merge Worker
9aff7bc75c
Merge "Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f" into rvc-d1-dev-plus-aosp am: d302e84497
...
Change-Id: Idd5f0b687572893a979ad9dd04a6fdcddd7c7c48
2020-05-30 06:51:35 +00:00
Jing Ji
dc1d0e2552
Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f am: cfe14d9f64
...
Change-Id: I5fd633e6d9a78cde7a428f182e84bbac21dcba0b
2020-05-30 06:51:28 +00:00
Jing Ji
6c6c34b40a
Add proper lock to the dropbox throttling map am: 3862660dea am: 6ac4335897 am: da12c6a191
...
Change-Id: I396d1a29411339b851775b406fb2d935e6c422a8
2020-05-30 06:51:16 +00:00
Automerger Merge Worker
d302e84497
Merge "Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f" into rvc-d1-dev-plus-aosp
2020-05-30 06:38:50 +00:00
Jing Ji
0f1dcc41e2
Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f
...
Change-Id: I8e4e4f4e167b34e710928222eace1b826ee0ea89
2020-05-30 06:38:44 +00:00
Jing Ji
da12c6a191
Add proper lock to the dropbox throttling map am: 3862660dea am: 6ac4335897
...
Change-Id: Ib48a79f8d555026b3ec98733d88429b46724c653
2020-05-30 06:38:41 +00:00
Jing Ji
cfe14d9f64
Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f
...
Change-Id: I77b8c204526874d4510f079038a02b3c1f9b0a71
2020-05-30 06:38:36 +00:00
Charles Chen
13e3568567
Merge "Fix get display from display context derived context not working" into rvc-dev
2020-05-30 06:35:35 +00:00
Jing Ji
6ac4335897
Add proper lock to the dropbox throttling map am: 3862660dea
...
Change-Id: Id1d3592816f2f3f3d1f088e9bf2e50e6ae8a49f3
2020-05-30 06:26:10 +00:00
Jing Ji
f1e411be3f
Add proper lock to the dropbox throttling map am: 3862660dea
...
Change-Id: I794d1d8b7647b58f085ad90c75c3bc8773765284
2020-05-30 06:25:56 +00:00
TreeHugger Robot
f591cbfe43
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: cba6fbf76b am: b722851665 am: 345e18689d
...
Change-Id: Ic04c85d2b299270773de5887893cebaa01732661
2020-05-30 05:16:06 +00:00
Automerger Merge Worker
205219f8fe
Merge "Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825 am: 84f683440d" into rvc-qpr-dev-plus-aosp am: fe7c9c351d
...
Change-Id: I4fa93b24dfa00fe4f8133601cae36fe27ea20d5f
2020-05-30 05:15:51 +00:00
TreeHugger Robot
c5a3065747
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825 am: 04718b67e4 am: 79118bc735
...
Change-Id: I88fee147568d9e01823c3039767bb30a4531cae9
2020-05-30 05:15:33 +00:00
Automerger Merge Worker
6615944a95
Merge "Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284 am: 4a63af5f8a" into rvc-qpr-dev-plus-aosp am: 8abb146a7d
...
Change-Id: Ice3ba18a3a833f53efb5bfa0962e6e070ee4a511
2020-05-30 05:15:11 +00:00
Automerger Merge Worker
09d7e6335a
Merge "Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: e6ce7f4255" into rvc-d1-dev-plus-aosp am: 6a59b5af9f am: 15516cfc65
...
Change-Id: I9ca04f9fa35d0c9957cc55872b14b25aec517537
2020-05-30 05:14:31 +00:00
Jing Ji
7715777209
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284 am: e1c2f429c1 am: 752a7f516b
...
Change-Id: I3060697512f93be9584b3a49fbf77fe2e9270519
2020-05-30 05:13:28 +00:00
TreeHugger Robot
345e18689d
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: cba6fbf76b am: b722851665
...
Change-Id: Ic247ba4f833274cc7d596e755340f36e4e09619c
2020-05-30 04:56:56 +00:00
Jing Ji
3862660dea
Add proper lock to the dropbox throttling map
...
Bug: 156871564
Test: Manual
Change-Id: I7da4f4b9586ea33eeb66875ab312701f49b62dd3
2020-05-29 21:56:47 -07:00
Automerger Merge Worker
fe7c9c351d
Merge "Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825 am: 84f683440d" into rvc-qpr-dev-plus-aosp
2020-05-30 04:56:30 +00:00
TreeHugger Robot
4251335aa3
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825 am: 84f683440d
...
Change-Id: I5e1806fdce30c31be5847154f5ba7f2d36bcbabe
2020-05-30 04:56:23 +00:00
TreeHugger Robot
79118bc735
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825 am: 04718b67e4
...
Change-Id: Ia3028a0faf59c0c1305a989f483a1868c96c0c01
2020-05-30 04:56:22 +00:00
Automerger Merge Worker
8abb146a7d
Merge "Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284 am: 4a63af5f8a" into rvc-qpr-dev-plus-aosp
2020-05-30 04:56:15 +00:00
Jing Ji
06126c7858
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284 am: 4a63af5f8a
...
Change-Id: I9f2c433e15290fa86051f0f25cd8d1749cbf76dd
2020-05-30 04:56:07 +00:00
Automerger Merge Worker
15516cfc65
Merge "Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: e6ce7f4255" into rvc-d1-dev-plus-aosp am: 6a59b5af9f
...
Change-Id: Id51dcfb068b10fa144b1f08ed2df4de4b6964f71
2020-05-30 04:56:03 +00:00
Jing Ji
752a7f516b
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284 am: e1c2f429c1
...
Change-Id: I3061d50f2497bf6aac692aee603cbb4517c7fca7
2020-05-30 04:55:44 +00:00
Charles Chen
e22c4cb3c6
Fix get display from display context derived context not working
...
In ContextImpl, we checked the flag "mIsAssociatedWithDisplay" to
identify if a context can access a display or not. The flag wasn't
passed from outer context, and it leads to an issue that context
which created from #createConfigurationContext from display context
failed to obtain display instance.
This CL passes mIsAssociatedWithDisplay from outer context and
also add test to verify the behavior.
fixes: 157719118
Test: atest ContextTest ContextAccessTest
Change-Id: Ibeb2a08c75f90304e12dcf99293c84409c5eea34
2020-05-30 12:46:59 +08:00
TreeHugger Robot
b722851665
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: cba6fbf76b
...
Change-Id: Ie32804c5f97b31be626344d5f185621f285aa766
2020-05-30 04:44:01 +00:00
TreeHugger Robot
84f683440d
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825
...
Change-Id: I7cdf4f29133dc515280b998396026b0ab9cd5b61
2020-05-30 04:43:48 +00:00
TreeHugger Robot
04718b67e4
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212 am: a046806825
...
Change-Id: I699be17b77962953fc2a521accfacdec5feadf42
2020-05-30 04:43:45 +00:00
Automerger Merge Worker
6a59b5af9f
Merge "Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: e6ce7f4255" into rvc-d1-dev-plus-aosp
2020-05-30 04:43:39 +00:00
Jing Ji
a4765a26cf
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: e6ce7f4255
...
Change-Id: Ida3cc0ef341f352abc2bda5a708199a109b9939f
2020-05-30 04:43:30 +00:00
Jing Ji
4a63af5f8a
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284
...
Change-Id: I0b611e034e7c4c7fb49469f7290f3afcfc9e41c9
2020-05-30 04:43:25 +00:00
Jing Ji
e1c2f429c1
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d am: 00ba82c284
...
Change-Id: I22654a52b4f2092caad3e74e4c7a60ed9bc949e0
2020-05-30 04:43:21 +00:00
TreeHugger Robot
cba6fbf76b
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212
...
Change-Id: I4a1e079c40bdac4a473ae8309f6903b7b08e23ec
2020-05-30 04:43:17 +00:00
TreeHugger Robot
a046806825
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev am: 4bacb14212
...
Change-Id: I3ed50779108befbf026e3d4b4733c9e2fd89fdb4
2020-05-30 04:43:05 +00:00
TreeHugger Robot
4bacb14212
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS." into rvc-dev
2020-05-30 04:28:48 +00:00
Jing Ji
e6ce7f4255
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d
...
Change-Id: I9c044190242ee7e9f107a80ff64f89e012d35f3b
2020-05-30 04:16:24 +00:00
Jing Ji
00ba82c284
Merge "Throttle the dropbox logs per event-type" into rvc-dev am: 559a551a7d
...
Change-Id: I57982e29a1796781dbae79253b75b4eaa681128b
2020-05-30 04:16:24 +00:00
Jing Ji
559a551a7d
Merge "Throttle the dropbox logs per event-type" into rvc-dev
2020-05-30 04:00:45 +00:00
Hongwei Wang
dab3596238
Merge "Retain current position and expand state on next video" into rvc-dev am: 7d4bad92af am: af9218f1d6 am: df5be383be am: 48941d1921
...
Change-Id: Icb1b05ee601b327c4e5be7d9f1e5358a5d034783
2020-05-30 02:08:10 +00:00
Hongwei Wang
70d602f1a3
Merge "Retain current position and expand state on next video" into rvc-dev am: 7d4bad92af am: b7a1bd5578 am: 2281ade68f am: 000b57ef98
...
Change-Id: I630cadcfd5dec6d5dc65d72e7be558513095895b
2020-05-30 02:07:57 +00:00
Nathan Harold
95f93de0ce
Merge "Fix Location Check for Barring and RegFail" into rvc-dev am: 2ecebea361 am: e586fa14ab am: 25bacb5934 am: 34eb474c46
...
Change-Id: I69a90f58cf87c4e4802319608dca38dbbeaf10a4
2020-05-30 02:07:39 +00:00
