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

Commit 7c8eac3f authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: Ic631e8ecb86b04183b3635581255bf0d0d43242d
Change-Id: I3238af10b1504ce711aa6039326e710fa5f38719
parents 6e2818b1 2e6fd72b

Android.bp

+2 −12
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ java_defaults { 


java_defaults {

    name: "NetworkStackReleaseApiLevel",

    // TODO: use system_30 once a prebuilt SDK is available for R

    sdk_version: "system_current",

    sdk_version: "system_30",

    min_sdk_version: "29",

    target_sdk_version: "30",

}
@@ -130,7 +129,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel"],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen-q",

        ":statslog-networkstack-java-gen",

    ],

    // API stable uses a jarjared version of the shims

    static_libs: [
@@ -255,15 +254,6 @@ cc_library_shared { 
    ],

}



genrule {

    name: "statslog-networkstack-java-gen-q",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +

         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +

         " --compileQ",

    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],

}



genrule {

    name: "statslog-networkstack-java-gen",

    tools: ["stats-log-api-gen"],

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.networkstack"

  android:sharedUserId="android.uid.networkstack"

  android:versionCode="299900000"

  android:versionCode="300000000"

  android:versionName="2019-09"

>

    <!-- Permissions must be defined here, and not in the base manifest, as the network stack

common/networkstackclient/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ aidl_interface { 
        java: {

            apex_available: [

                "//apex_available:platform",

                "com.android.wifi",

                "com.android.bluetooth.updatable",

                "com.android.tethering",

            ],
@@ -95,6 +96,7 @@ aidl_interface { 
            apex_available: [

                "//apex_available:platform",

                "com.android.bluetooth.updatable",

                "com.android.wifi",

                "com.android.tethering",

            ],

            // this is part of updatable modules(NetworkStack) which targets 29(Q)

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 {

src/com/android/networkstack/metrics/DataStallDetectionStats.java

+5 −3
Original line number Diff line number Diff line
@@ -261,11 +261,13 @@ public final class DataStallDetectionStats { 
            if (info == null) return DataStallEventProto.AP_BAND_UNKNOWN;



            int freq = info.getFrequency();

            // Refer to ScanResult.is5GHz() and ScanResult.is24GHz().

            if (freq > 4900 && freq < 5900) {

            // Refer to ScanResult.is5GHz(), ScanResult.is24GHz() and ScanResult.is6GHz().

            if (freq >= 5160 && freq <= 5865) {

                return DataStallEventProto.AP_BAND_5GHZ;

            } else if (freq > 2400 && freq < 2500) {

            } else if (freq >= 2412 && freq <= 2484) {

                return DataStallEventProto.AP_BAND_2GHZ;

            } else if (freq >= 5945 && freq <= 7105) {

                return DataStallEventProto.AP_BAND_6GHZ;

            } else {

                return DataStallEventProto.AP_BAND_UNKNOWN;

            }