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

Commit ead51323 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ns_core_visibility" 

* changes:
  Delete NetworkStatsFactoryBenchmark
  Allow core tests to use hidden connectivity API
parents 472bc8d9 8c67bb00

core/tests/bandwidthtests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ package { 


android_test {

    name: "BandwidthTests",

    defaults: ["framework-connectivity-test-defaults"],

    // Include all test java files.

    srcs: ["src/**/*.java"],

    libs: [

core/tests/benchmarks/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ package { 


java_library {

    name: "frameworks-base-core-benchmarks",

    defaults: ["framework-connectivity-test-defaults"],

    installable: true,

    srcs: ["src/**/*.java"],

    libs: ["caliper-api-target"],

core/tests/utillib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ package { 


java_library {

    name: "frameworks-core-util-lib",

    defaults: ["framework-connectivity-test-defaults"],



    srcs: ["**/*.java"],

tests/benchmarks/Android.bp

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
// Copyright (C) 2015 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.



// build framework base core benchmarks

// ============================================================



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



java_library {

    name: "networkStatsFactory-benchmarks",

    installable: true,



    srcs: ["src/**/*.java"],



    libs: [

        "caliper-api-target",

        "services.core",

    ],



}

tests/benchmarks/src/com/android/server/net/NetworkStatsFactoryBenchmark.java

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 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.server.net;



import android.net.NetworkStats;

import android.os.SystemClock;

import com.android.server.net.NetworkStatsFactory;

import com.google.caliper.AfterExperiment;

import com.google.caliper.BeforeExperiment;

import java.io.File;



public class NetworkStatsFactoryBenchmark {

    private File mStats;



    // TODO: consider staging stats file with different number of rows



    @BeforeExperiment

    protected void setUp() {

        mStats = new File("/proc/net/xt_qtaguid/stats");

    }



    @AfterExperiment

    protected void tearDown() {

        mStats = null;

    }



    public void timeReadNetworkStatsDetailJava(int reps) throws Exception {

        for (int i = 0; i < reps; i++) {

            NetworkStatsFactory.javaReadNetworkStatsDetail(mStats, NetworkStats.UID_ALL,

                    // Looks like this was broken by change d0c5b9abed60b7bc056d026bf0f2b2235410fb70

                    // Fixed compilation problem but needs addressing properly.

                    new String[0], 999);

        }

    }



    public void timeReadNetworkStatsDetailNative(int reps) {

        for (int i = 0; i < reps; i++) {

            final NetworkStats stats = new NetworkStats(SystemClock.elapsedRealtime(), 0);

            NetworkStatsFactory.nativeReadNetworkStatsDetail(

                    stats, mStats.getAbsolutePath(), NetworkStats.UID_ALL,

                    // Looks like this was broken by change d0c5b9abed60b7bc056d026bf0f2b2235410fb70

                    // Fixed compilation problem but needs addressing properly.

                    new String[0], 999, false);

        }

    }

}