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

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

Snap for 6647388 from c5c294b9 to rvc-release 

Change-Id: Id89e24a0077bee4154a240734c04d193d1977cba
parents eb3e87d4 c5c294b9

jarjar-rules-shared.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ rule com.android.net.module.util.** com.android.networkstack.util.@1 
# TODO: move DhcpResults into services.net and delete from here

rule android.net.DhcpResultsParcelable* @0

rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1

rule android.net.LocalLog* android.net.networkstack.LocalLog@1
 
rule android.util.LocalLog* android.net.networkstack.util.LocalLog@1

src/com/android/networkstack/NetworkStackNotifier.java

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ public class NetworkStackNotifier { 
                    .setContentText(res.getString(R.string.tap_for_info))

                    .setContentIntent(mDependencies.getActivityPendingIntent(

                            getContextAsUser(mContext, UserHandle.CURRENT),

                            infoIntent, PendingIntent.FLAG_UPDATE_CURRENT));

                            infoIntent, PendingIntent.FLAG_IMMUTABLE));



            networkStatus.mShownNotification = NOTE_VENUE_INFO;

        } else if (showValidated) {
@@ -252,7 +252,7 @@ public class NetworkStackNotifier { 
                    .setContentIntent(mDependencies.getActivityPendingIntent(

                            getContextAsUser(mContext, UserHandle.CURRENT),

                            new Intent(Settings.ACTION_WIFI_SETTINGS),

                            PendingIntent.FLAG_UPDATE_CURRENT));

                            PendingIntent.FLAG_IMMUTABLE));



            networkStatus.mShownNotification = NOTE_CONNECTED;

        } else {

tests/integration/Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -82,6 +82,18 @@ android_test { 
    test_suites: ["device-tests"],

}



// The static lib needs to be jarjared by each module so they do not conflict with each other

// (e.g. wifi, system server, network stack need to use different package names when including it).

// Apply NetworkStack jarjar rules to the tests as well so classes in NetworkStaticLibTests have the

// same package names as in module code.

android_library {

    name: "NetworkStackStaticLibTestsLib",

    platform_apis: true,

    min_sdk_version: "29",

    jarjar_rules: ":NetworkStackJarJarRules",

    static_libs: ["NetworkStaticLibTestsLib"],

}



// Special version of the network stack tests that includes all tests necessary for code coverage

// purposes. This is currently the union of NetworkStackTests and NetworkStackIntegrationTests.

android_test {
@@ -95,7 +107,7 @@ android_test { 
    static_libs: [

        "NetworkStackTestsLib",

        "NetworkStackIntegrationTestsLib",

        "NetworkStaticLibTestsLib",

        "NetworkStackStaticLibTestsLib",

    ],

    compile_multilib: "both",

    manifest: "AndroidManifest_coverage.xml",

tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt

+6 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.app.NotificationManager 
import android.app.NotificationManager.IMPORTANCE_DEFAULT

import android.app.NotificationManager.IMPORTANCE_NONE

import android.app.PendingIntent

import android.app.PendingIntent.FLAG_UPDATE_CURRENT

import android.app.PendingIntent.FLAG_IMMUTABLE

import android.content.Context

import android.content.Intent

import android.content.res.Resources
@@ -57,6 +57,7 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.anyInt

import org.mockito.ArgumentMatchers.eq

import org.mockito.ArgumentMatchers.intThat

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.Mockito.any
@@ -188,7 +189,8 @@ class NetworkStackNotifierTest { 
        assertEquals(CHANNEL_CONNECTED, note.channelId)

        assertEquals(timeout, note.timeoutAfter)

        verify(mDependencies).getActivityPendingIntent(

                eq(mCurrentUserContext), mIntentCaptor.capture(), eq(FLAG_UPDATE_CURRENT))

                eq(mCurrentUserContext), mIntentCaptor.capture(),

                intThat { it or FLAG_IMMUTABLE != 0 })

    }



    private fun verifyCanceledNotificationAfterNetworkLost() {
@@ -279,7 +281,8 @@ class NetworkStackNotifierTest { 


        verify(mNm).notify(eq(TEST_NETWORK_TAG), mNoteIdCaptor.capture(), mNoteCaptor.capture())

        verify(mDependencies).getActivityPendingIntent(

                eq(mCurrentUserContext), mIntentCaptor.capture(), eq(FLAG_UPDATE_CURRENT))

                eq(mCurrentUserContext), mIntentCaptor.capture(),

                intThat { it or FLAG_IMMUTABLE != 0 })

        verifyVenueInfoIntent(mIntentCaptor.value)

        verifyCanceledNotificationAfterDefaultNetworkLost()

    }