Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev am: 8a44e4f274

am: 649f98541a Change-Id: I226fff13988a87780cbf7c042619c36efcbae63f
2019-07-03 19:21:40 -07:00
parent 34eba28f51 649f98541a
commit 5cc68af9ca
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;
        }
    }