commit 2cdb854239b4a448433c5f8fff55d0ffc63c09e0
author Grace Jia <xiaotonj@google.com> Wed Mar 10 14:33:50 2021 -0800
committer Grace Jia <xiaotonj@google.com> Thu Mar 18 19:22:49 2021 -0700
tree 18817372aabde234e213de4f4ca76fb366838e51
parent f0431aff6b6188fa55a71bb86893db5fd8d3524d

Improvements of D2D API according to the review

Bug: 181681064
Test: cts test
Change-Id: I618820b905271a615d0859b90af4a722508f863d

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

diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
index 064f45e..6899692 100755
--- a/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
@@ -914,14 +914,15 @@
     public void testSetAndGetD2DStatusSharing() {
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         uiAutomation.adoptShellPermissionIdentity(MODIFY_PHONE_STATE);
-        int originalD2DStatusSharing = mSm.getDeviceToDeviceStatusSharing(mSubId);
-        mSm.setDeviceToDeviceStatusSharing(SubscriptionManager.D2D_SHARING_ALL_CONTACTS, mSubId);
+        int originalD2DStatusSharing = mSm.getDeviceToDeviceStatusSharingPreference(mSubId);
+        mSm.setDeviceToDeviceStatusSharingPreference(SubscriptionManager.D2D_SHARING_ALL_CONTACTS,
+                mSubId);
         assertEquals(SubscriptionManager.D2D_SHARING_ALL_CONTACTS,
-                mSm.getDeviceToDeviceStatusSharing(mSubId));
-        mSm.setDeviceToDeviceStatusSharing(SubscriptionManager.D2D_SHARING_ALL, mSubId);
+                mSm.getDeviceToDeviceStatusSharingPreference(mSubId));
+        mSm.setDeviceToDeviceStatusSharingPreference(SubscriptionManager.D2D_SHARING_ALL, mSubId);
         assertEquals(SubscriptionManager.D2D_SHARING_ALL,
-                mSm.getDeviceToDeviceStatusSharing(mSubId));
-        mSm.setDeviceToDeviceStatusSharing(originalD2DStatusSharing, mSubId);
+                mSm.getDeviceToDeviceStatusSharingPreference(mSubId));
+        mSm.setDeviceToDeviceStatusSharingPreference(originalD2DStatusSharing, mSubId);
         uiAutomation.dropShellPermissionIdentity();
     }