commit db9771b9e486be2b5667c29649cf16c8a401a2f8
author Hongbo Zeng <hongbozeng@google.com> Wed Apr 07 03:12:44 2021 +0800
committer Hongbo Zeng <hongbozeng@google.com> Thu Apr 08 09:42:25 2021 +0800
tree 767174bbf7780e002b7c978a4360e1d090ff56b2
parent d9444672b544d064de6de2c9c3fabee7ebac6986

Fix API review issues for 5G Slicing feature

- Rename SlicingConfig to NetworkSlicingConfig

Bug: 183714964
Test: atest TelephonyManagerTest#testGetNetworkSlicingConfiguration
Change-Id: I958d8a082c493c16c317fcb17cd9a13ea6355a7a

tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java

diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
index 69e1901..2f384f8 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -89,7 +89,7 @@
 import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.data.ApnSetting;
-import android.telephony.data.SlicingConfig;
+import android.telephony.data.NetworkSlicingConfig;
 import android.telephony.emergency.EmergencyNumber;
 import android.text.TextUtils;
 import android.util.Log;
@@ -4535,7 +4535,7 @@
         if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             return;
         }
-        CompletableFuture<SlicingConfig> resultFuture = new CompletableFuture<>();
+        CompletableFuture<NetworkSlicingConfig> resultFuture = new CompletableFuture<>();
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
                 (tm) -> tm.getNetworkSlicingConfiguration(mSimpleExecutor, resultFuture::complete));
     }