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

Commit 86eec46e authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Remi NGUYEN VAN
Browse files

Move sensitive field parceling bool to constructor 

This addresses API review comments recommending to use a copy
constructor with additional parameters instead of a dedicated method.
makeSensitiveFieldsParcelingCopy becomes LinkProperties(base, true).

Bug: 150877475
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Merged-In: I588a40cd32667aba8e11c663833621b1c441a87a
(cherry picked from commit a148ea2a)

Change-Id: Ibe7c94627c2a6af45b129020808b752207ff82b6
parent 04e10117

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);