Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove @hide usage and fix NetworkPolicy backup" am: 027b7e9604 am: 3ebe8bd26b am: 1a2183a68a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978091

Change-Id: Ibd557eeceb1cfa07e74a77c29255a1f87995c91a
This commit is contained in:
Treehugger Robot
2022-02-10 20:21:31 +00:00
committed by Automerger Merge Worker
parent 8e013d9b38 1a2183a68a
commit cdd8c9a679
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkPolicy.java
View File

@@ -338,7 +338,9 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> {
out.writeInt(TEMPLATE_BACKUP_VERSION_LATEST); out.writeInt(TEMPLATE_BACKUP_VERSION_LATEST);
out.writeInt(template.getMatchRule()); out.writeInt(template.getMatchRule());
BackupUtils.writeString(out, template.getSubscriberIds().iterator().next()); final Set<String> subscriberIds = template.getSubscriberIds();
BackupUtils.writeString(out, subscriberIds.isEmpty()
? null : subscriberIds.iterator().next());
BackupUtils.writeString(out, template.getWifiNetworkKeys().isEmpty() BackupUtils.writeString(out, template.getWifiNetworkKeys().isEmpty()
? null : template.getWifiNetworkKeys().iterator().next()); ? null : template.getWifiNetworkKeys().iterator().next());
out.writeInt(template.getMeteredness()); out.writeInt(template.getMeteredness());

16
core/tests/coretests/src/android/net/NetworkPolicyTest.kt
View File

@@ -16,7 +16,9 @@
package android.net package android.net
import android.net.NetworkStats.METERED_YES
import android.net.NetworkTemplate.MATCH_BLUETOOTH import android.net.NetworkTemplate.MATCH_BLUETOOTH
import android.net.NetworkTemplate.MATCH_CARRIER
import android.net.NetworkTemplate.MATCH_ETHERNET import android.net.NetworkTemplate.MATCH_ETHERNET
import android.net.NetworkTemplate.MATCH_MOBILE import android.net.NetworkTemplate.MATCH_MOBILE
import android.net.NetworkTemplate.MATCH_WIFI import android.net.NetworkTemplate.MATCH_WIFI
@@ -39,11 +41,19 @@ class NetworkPolicyTest {
@Test @Test
fun testTemplateBackupRestore() { fun testTemplateBackupRestore() {
assertPolicyBackupRestore(createTestPolicyForTemplate( assertPolicyBackupRestore(createTestPolicyForTemplate(
NetworkTemplate.buildTemplateWifi(TEST_WIFI_NETWORK_KEY1))) NetworkTemplate.Builder(MATCH_WIFI)
.setWifiNetworkKeys(setOf(TEST_WIFI_NETWORK_KEY1))
.build()))
assertPolicyBackupRestore(createTestPolicyForTemplate( assertPolicyBackupRestore(createTestPolicyForTemplate(
NetworkTemplate.buildTemplateMobileAll(TEST_IMSI1))) NetworkTemplate.Builder(MATCH_MOBILE)
.setSubscriberIds(setOf(TEST_IMSI1))
.setMeteredness(METERED_YES)
.build()))
assertPolicyBackupRestore(createTestPolicyForTemplate( assertPolicyBackupRestore(createTestPolicyForTemplate(
NetworkTemplate.buildTemplateCarrierMetered(TEST_IMSI1))) NetworkTemplate.Builder(MATCH_CARRIER)
.setSubscriberIds(setOf(TEST_IMSI1))
.setMeteredness(METERED_YES)
.build()))
} }
private fun createTestPolicyForTemplate(template: NetworkTemplate): NetworkPolicy { private fun createTestPolicyForTemplate(template: NetworkTemplate): NetworkPolicy {

9
core/tests/coretests/src/com/android/internal/os/MobileRadioPowerCalculatorTest.java
View File

@@ -16,6 +16,9 @@
package com.android.internal.os; package com.android.internal.os;
import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
import static android.net.NetworkStats.METERED_NO;
import static android.net.NetworkStats.ROAMING_NO;
import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE; import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -89,7 +92,8 @@ public class MobileRadioPowerCalculatorTest {
// Note application network activity // Note application network activity
NetworkStats networkStats = new NetworkStats(10000, 1) NetworkStats networkStats = new NetworkStats(10000, 1)
.insertEntry("cellular", APP_UID, 0, 0, 1000, 100, 2000, 20, 100); .addEntry(new NetworkStats.Entry("cellular", APP_UID, 0, 0,
METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, 1000, 100, 2000, 20, 100));
mStatsRule.setNetworkStats(networkStats); mStatsRule.setNetworkStats(networkStats);
ModemActivityInfo mai = new ModemActivityInfo(10000, 2000, 3000, ModemActivityInfo mai = new ModemActivityInfo(10000, 2000, 3000,
@@ -150,7 +154,8 @@ public class MobileRadioPowerCalculatorTest {
// Note application network activity // Note application network activity
NetworkStats networkStats = new NetworkStats(10000, 1) NetworkStats networkStats = new NetworkStats(10000, 1)
.insertEntry("cellular", APP_UID, 0, 0, 1000, 100, 2000, 20, 100); .addEntry(new NetworkStats.Entry("cellular", APP_UID, 0, 0,
METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO, 1000, 100, 2000, 20, 100));
mStatsRule.setNetworkStats(networkStats); mStatsRule.setNetworkStats(networkStats);
ModemActivityInfo mai = new ModemActivityInfo(10000, 2000, 3000, ModemActivityInfo mai = new ModemActivityInfo(10000, 2000, 3000,

10
core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java
View File

@@ -16,7 +16,9 @@
package com.android.internal.os; package com.android.internal.os;
import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
import static android.net.NetworkStats.METERED_NO;
import static android.net.NetworkStats.ROAMING_NO;
import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE; import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -67,8 +69,10 @@ public class WifiPowerCalculatorTest {
new int[]{NetworkCapabilities.TRANSPORT_WIFI}); new int[]{NetworkCapabilities.TRANSPORT_WIFI});
NetworkStats networkStats = new NetworkStats(10000, 1) NetworkStats networkStats = new NetworkStats(10000, 1)
.insertEntry("wifi", APP_UID, 0, 0, 1000, 100, 2000, 20, 100) .addEntry(new NetworkStats.Entry("wifi", APP_UID, 0, 0, METERED_NO,
.insertEntry("wifi", Process.WIFI_UID, 0, 0, 1111, 111, 2222, 22, 111); ROAMING_NO, DEFAULT_NETWORK_NO, 1000, 100, 2000, 20, 100))
.addEntry(new NetworkStats.Entry("wifi", Process.WIFI_UID, 0, 0, METERED_NO,
ROAMING_NO, DEFAULT_NETWORK_NO, 1111, 111, 2222, 22, 111));
mStatsRule.setNetworkStats(networkStats); mStatsRule.setNetworkStats(networkStats);
return batteryStats; return batteryStats;