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

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

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

Change-Id: Id77c90354df02d02210250f6b8cf3731b3741f7b
parents 66d2b9ed 8e66eaf8

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ public class NetworkInformationShimImpl extends 
    @NonNull

    @NonNull

    @Override

    @Override

    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

        return lp.makeSensitiveFieldsParcelingCopy();

        return new LinkProperties(lp, true);

    }

    }





    @Override

    @Override

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ public interface NetworkInformationShim { 
    String getSsid(@Nullable NetworkCapabilities nc);

    String getSsid(@Nullable NetworkCapabilities nc);





    /**

    /**

     * @see LinkProperties#makeSensitiveFieldsParcelingCopy()

     * @see LinkProperties#LinkProperties(LinkProperties, boolean)

     */

     */

    @NonNull

    @NonNull

    LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp);

    LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp);