commit f1c79f8dac61141a518b87361cfef0619e3ef49e
author Erik Kline <ek@google.com> Thu Mar 29 23:38:49 2018 -0700
committer Erik Kline <ek@google.com> Thu Mar 29 23:38:49 2018 -0700
tree afa8c34247f3af38f77be45a172c8e80adde1418
parent 0b1d19ca5f77aa99fee2f390c76c40c9bfcef8b4

When manipulating flags, |= rather than +=

Test: as follows
    - builds
    - flashes
    - boots
    - runtest -x external/android-clat/clatd_test.cpp passes
Bug: 64133961
Bug: 72345192

Change-Id: Ieb46fa6a158ec7470e261cc6e9345a3266c81a04

dns64.c

diff --git a/dns64.c b/dns64.c
index a9ca61d..ed28eb0 100644
--- a/dns64.c
+++ b/dns64.c
@@ -49,7 +49,7 @@
 
   // Be sure to query local DNS64 servers, bypassing Private DNS (if enabled).
   if (net_id != NETID_UNSET) {
-    net_id += NETID_USE_LOCAL_NAMESERVERS;
+    net_id |= NETID_USE_LOCAL_NAMESERVERS;
   }
 
   status = android_getaddrinfofornet(ipv4_name, NULL, &hints, net_id, MARK_UNSET, &result);