Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17098625 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Move sensitive field parceling bool to constructor" am: a856de3d am:... 

Merge "Move sensitive field parceling bool to constructor" am: a856de3d am: 8e66eaf8 am: 974b247f am: d6ec6b36

Change-Id: I9195d5fcc8eb0adb4eea5472cf714293aa5210a2
parents 8afecca8 d6ec6b36

apishim/30/com/android/networkstack/apishim/NetworkInformationShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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

apishim/common/com/android/networkstack/apishim/NetworkInformationShim.java

+1 −1
Original line number Diff line number Diff line
@@ -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);