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

Commit d0254d6d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6310897 from 2971cca6 to mainline-release 

Change-Id: I1ef7c15b65988ca0a0637ad64e5935904a7e18a7
parents be4114eb 2971cca6

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

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
6746d9d25ede3846456a8b04fb656f87bb0e86ce

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
a907768c6d4a4d9c61531d914dec836816a6098a

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
b45a7fefdb5bd3c8197851baf1297f204a903821