commit 922249e2bb5f462bf64e0a8832dd6781f532db8f
author James Mattis <jmattis@google.com> Tue Apr 06 04:35:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 06 04:35:37 2021 +0000
tree 3f3f57979f433612516a28abee2dd63a8a7a0a03
parent 7faee617b9b48584308f31354beeff13c5901b07
parent bd275dcf3da97fc49d229ebef0005bca11b28cfc

Merge "Adding per-app support for app add/remove"

framework/aidl-export/android/net/IpPrefix.aidl

diff --git a/framework/aidl-export/android/net/IpPrefix.aidl b/framework/aidl-export/android/net/IpPrefix.aidl
index 0d70f2a..3495efc 100644
--- a/framework/aidl-export/android/net/IpPrefix.aidl
+++ b/framework/aidl-export/android/net/IpPrefix.aidl
@@ -18,5 +18,5 @@
 package android.net;
 
 // @JavaOnlyStableParcelable only affects the parcelable when built as stable aidl (aidl_interface
-// build rule). IpPrefix is also used in cpp but only as non-stable aidl.
-@JavaOnlyStableParcelable parcelable IpPrefix cpp_header "binder/IpPrefix.h";
+// build rule).
+@JavaOnlyStableParcelable parcelable IpPrefix;

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 8958909..a6f1a72 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6677,7 +6677,7 @@
                     mDeps.reportNetworkInterfaceForTransports(mContext, iface,
                             caps.getTransportTypes());
                 } catch (Exception e) {
-                    loge("Exception adding interface: " + e);
+                    logw("Exception adding interface: " + e);
                 }
             }
         }