Merge "Update system APIs based on feedback."

2023-03-09 02:47:49 +00:00
parent 709d8f3062 4ffd34cc42
commit 31b6c65f51
3 changed files with 5 additions and 3 deletions
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -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);
                }