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

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

Snap for 7259092 from b2e80108 to mainline-media-swcodec-release 

Change-Id: I8d74fd1e8978d48832f660c53a25bb28258fad16
parents d0a98b9e b2e80108

TEST_MAPPING

+20 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,26 @@ 
      "name": "NetworkStackIntegrationTests"

      "name": "NetworkStackIntegrationTests"

    }

    }

  ],

  ],

  "auto-postsubmit": [

    // Test tag for automotive targets. These are only running in postsubmit so as to harden the

    // automotive targets to avoid introducing additional test flake and build time. The plan for

    // presubmit testing for auto is to augment the existing tests to cover auto use cases as well.

    // Additionally, this tag is used in targeted test suites to limit resource usage on the test

    // infra during the hardening phase.

    // TODO: this tag to be removed once the above is no longer an issue.

    {

      "name": "NetworkStackTests"

    },

    {

      "name": "NetworkStackNextTests"

    },

    {

      "name": "NetworkStackHostTests"

    },

    {

      "name": "NetworkStackIntegrationTests"

    }

  ],

  "mainline-presubmit": [

  "mainline-presubmit": [

    // These are unit tests only, so they don't actually require any modules to be installed.

    // These are unit tests only, so they don't actually require any modules to be installed.

    // We must specify at least one module here or the tests won't run. Use the same set as CTS

    // We must specify at least one module here or the tests won't run. Use the same set as CTS

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim 
    }

    }





    @Override

    @Override

    public String getVenueFriendlyName() {

    public CharSequence getVenueFriendlyName() {

        // Not supported in API level 29

        // Not supported in API level 29

        return null;

        return null;

    }

    }

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import android.net.NetworkRequest; 
import android.os.Handler;

import android.os.Handler;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;





import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
@@ -45,7 +44,7 @@ public class ConnectivityManagerShimImpl implements ConnectivityManagerShim { 
     */

     */

    @Override

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        // Not supported for API 29.

        // Not supported for API 29.

        throw new UnsupportedApiLevelException("Not supported in API 29.");

        throw new UnsupportedApiLevelException("Not supported in API 29.");

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

0 → 100644
+49 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.networkstack.apishim.api29;



import android.net.NetworkRequest;

import android.util.Range;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.networkstack.apishim.common.NetworkRequestShim;

import com.android.networkstack.apishim.common.UnsupportedApiLevelException;



import java.util.Set;



/**

 * Implementation of {@link NetworkRequestShim} for API 29.

 */

public class NetworkRequestShimImpl implements NetworkRequestShim {

    protected NetworkRequestShimImpl() {}



    /**

     * Get a new instance of {@link NetworkRequestShim}.

     */

    public static NetworkRequestShim newInstance() {

        return new NetworkRequestShimImpl();

    }



    @Override

    public void setUids(@NonNull NetworkRequest.Builder builder,

            @Nullable Set<Range<Integer>> uids) throws UnsupportedApiLevelException {

        // Not supported before API 31.

        throw new UnsupportedApiLevelException("Not supported before API 31.");

    }

}

apishim/30/com/android/networkstack/apishim/api30/ConnectivityManagerShimImpl.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.Build; 
import android.os.Handler;

import android.os.Handler;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;





import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ShimUtils;

import com.android.networkstack.apishim.common.ShimUtils;
@@ -55,7 +54,7 @@ public class ConnectivityManagerShimImpl 
     */

     */

    @Override

    @Override

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

    public void requestBackgroundNetwork(@NonNull NetworkRequest request,

            @Nullable Handler handler, @NonNull NetworkCallback networkCallback)

            @NonNull Handler handler, @NonNull NetworkCallback networkCallback)

            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        // Not supported for API 30.

        // Not supported for API 30.

        throw new UnsupportedApiLevelException("Not supported in API 30.");

        throw new UnsupportedApiLevelException("Not supported in API 30.");