diff options
| author | Varun Anand <vaanand@google.com> | 2019-03-05 19:23:50 +0000 |
|---|---|---|
| committer | Varun Anand <vaanand@google.com> | 2019-03-07 06:13:03 +0000 |
| commit | 6a050c7c50fa0838d7e29b8c6e244018044246db (patch) | |
| tree | 845a7e1d8d90f2258c6e5a9a8915db5b3e776d93 /rs/java/android/renderscript/RenderScript.java | |
| parent | ad8805a6c217338b12511f220cce22211a19080a (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
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions