LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update system APIs based on feedback."

Browse Source
This commit is contained in:
Jeff Sharkey
2023-03-09 02:47:49 +00:00
committed by Gerrit Code Review
parent 709d8f3062 4ffd34cc42
commit 31b6c65f51
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -537,7 +537,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
BroadcastOptions.makeBasic())
.setDeliveryGroupPolicy(
ConstantsShim.DELIVERY_GROUP_POLICY_MOST_RECENT)
.setDeferUntilActive(true)
.setDeferralPolicy(
ConstantsShim.DEFERRAL_POLICY_UNTIL_ACTIVE)
.toBundle();
} catch (UnsupportedApiLevelException e) {
Log.wtf(TAG, "Using unsupported API" + e);

2
service/src/com/android/server/ConnectivityService.java
View File

@@ -3133,7 +3133,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
optsShim.setDeliveryGroupPolicy(ConstantsShim.DELIVERY_GROUP_POLICY_MOST_RECENT);
optsShim.setDeliveryGroupMatchingKey(ConnectivityManager.CONNECTIVITY_ACTION,
createDeliveryGroupKeyForConnectivityAction(info));
optsShim.setDeferUntilActive(true);
optsShim.setDeferralPolicy(ConstantsShim.DEFERRAL_POLICY_UNTIL_ACTIVE);
} catch (UnsupportedApiLevelException e) {
Log.wtf(TAG, "Using unsupported API" + e);
}

3
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -864,7 +864,8 @@ public class ConnectivityServiceTest {
verify(mBroadcastOptionsShim).setDeliveryGroupMatchingKey(
eq(CONNECTIVITY_ACTION),
eq(createDeliveryGroupKeyForConnectivityAction(ni)));
verify(mBroadcastOptionsShim).setDeferUntilActive(eq(true));
verify(mBroadcastOptionsShim).setDeferralPolicy(
eq(ConstantsShim.DEFERRAL_POLICY_UNTIL_ACTIVE));
} catch (UnsupportedApiLevelException e) {
throw new RuntimeException(e);
}