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

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

Snap for 6302218 from 9f4d4068 to mainline-release 

Change-Id: Idd47f5be41bf86087f4ac62636e8cff462e4d567
parents 8de699ca 9f4d4068

AndroidManifestBase.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
          android:versionCode="11"

          android:versionName="Q-initial">

    <application

        android:label="NetworkStack"

        android:label="@string/application_label"

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true"

        android:usesCleartextTraffic="true">

apishim/29/com/android/networkstack/apishim/api29/NetworkInformationShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class NetworkInformationShimImpl implements NetworkInformationShim { 


    @Nullable

    @Override

    public String getSSID(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

        // Not supported on this API level

        return null;

    }

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

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


    @Nullable

    @Override

    public String getSSID(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

        if (nc == null) return null;

        return nc.getSSID();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public interface NetworkInformationShim { 
     * @see NetworkCapabilities#getSSID()

     */

    @Nullable

    String getSSID(@Nullable NetworkCapabilities nc);

    String getSsid(@Nullable NetworkCapabilities nc);



    /**

     * @see LinkProperties#makeSensitiveFieldsParcelingCopy()

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -47,4 +47,7 @@ 
         information page, so that the user can access that page. This is the message of

         the notification. [CHAR LIMIT=50] -->

    <string name="tap_for_info">Tap for venue information</string>



    <!-- The label of application. It's also a sender name of notification. [CHAR LIMIT=50]-->

    <string name="application_label">Connectivity Manager</string>

</resources>