Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev

am: 8a44e4f274 Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
2019-07-03 17:19:49 -07:00
parent dbd5065d5b 8a44e4f274
commit 649f98541a
3 changed files with 14 additions and 11 deletions
--- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -458,7 +458,7 @@ public class TetherServiceTest extends ServiceTestCase<TetherService> {
        }

        @Override
-        int getDefaultDataSubscriptionId() {
+        int getActiveDataSubscriptionId() {
            return INVALID_SUBSCRIPTION_ID;
        }
    }