diff options
| author | Varun Anand <vaanand@google.com> | 2019-03-05 19:23:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-13 18:01:56 +0000 |
| commit | 0aa677c75909c0d307fc4a2d3642ae8e85679280 (patch) | |
| tree | 107ee1f46277a025b42592d45b1bf15e80d70de8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d374204d68d4eecf1acecc8ee47945eb3a7ab092 (diff) | |
Revert "Update VPN capabilities when its underlying network set is null."
This reverts commit ad8805a6c217338b12511f220cce22211a19080a.
Bug: 126245192
Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.
Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.
Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
(cherry picked from commit 6a050c7c50fa0838d7e29b8c6e244018044246db)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions