diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-31 21:25:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-31 21:25:12 -0700 |
| commit | 940cbf970a3f87003a22e92669dfa7e1fa3db539 (patch) | |
| tree | f13ef17e2102bd6d301f9a706db9b33c6d061607 /core/java/android | |
| parent | ae55a7a3697f908e98dc1ffdeb07be6099048f16 (diff) | |
| parent | f75ba075e4d96dde3fc4c6340a790c7ef64bd116 (diff) | |
Merge "Fix race when starting NetworkMonitor" am: 78454f3c46
am: f75ba075e4
Change-Id: I049ea18e6c5c42a1b31d93541aa3846b14b7ab08
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.aidl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkCapabilities.aidl b/core/java/android/net/NetworkCapabilities.aidl index cd7d71cad978..01d328605de4 100644 --- a/core/java/android/net/NetworkCapabilities.aidl +++ b/core/java/android/net/NetworkCapabilities.aidl @@ -17,5 +17,5 @@ package android.net; -parcelable NetworkCapabilities; +@JavaOnlyStableParcelable parcelable NetworkCapabilities; |