diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-03-19 01:32:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-19 01:32:48 +0000 |
| commit | 32396008c20b0f245624b52ff390f19499487781 (patch) | |
| tree | fc744b292ce73c6f84fa97e9115f66895fe495fd | |
| parent | b4ed5ab8f56c6e580772e7e812143329be678c2f (diff) | |
| parent | 86eec46ee2c479d7ecee8ea863fb40472618458d (diff) | |
Merge "Move sensitive field parceling bool to constructor" into rvc-dev
| -rw-r--r-- | apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java | 2 | ||||
| -rw-r--r-- | apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java b/apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java index e491d25..03b28cd 100644 --- a/apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java +++ b/apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java @@ -81,7 +81,7 @@ public class NetworkInformationShimImpl extends @NonNull @Override public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) { - return lp.makeSensitiveFieldsParcelingCopy(); + return new LinkProperties(lp, true); } @Override diff --git a/apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java b/apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java index 5bf4e7a..315a6f8 100644 --- a/apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java +++ b/apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java @@ -54,7 +54,7 @@ public interface NetworkInformationShim { String getSsid(@Nullable NetworkCapabilities nc); /** - * @see LinkProperties#makeSensitiveFieldsParcelingCopy() + * @see LinkProperties#LinkProperties(LinkProperties, boolean) */ @NonNull LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp); |