Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API review response for d2d relative APIs." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-06 22:44:48 +00:00
committed by Android (Google) Code Review
parent 35871022c3 25a8bdb635
commit 2cf7f6dacf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -42374,7 +42374,7 @@ package android.telephony {
method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(@NonNull java.util.List<android.net.Uri>, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(int, @NonNull java.util.List<android.net.Uri>);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingPreference(int, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingPreference(int, int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int);
method public void setSubscriptionOverrideCongested(int, boolean, long); method public void setSubscriptionOverrideCongested(int, boolean, long);

8
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -3493,8 +3493,8 @@ public class SubscriptionManager {
* @param subscriptionId the unique Subscription ID in database * @param subscriptionId the unique Subscription ID in database
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setDeviceToDeviceStatusSharingPreference( public void setDeviceToDeviceStatusSharingPreference(int subscriptionId,
@DeviceToDeviceStatusSharingPreference int sharing, int subscriptionId) { @DeviceToDeviceStatusSharingPreference int sharing) {
if (VDBG) { if (VDBG) {
logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: " logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: "
+ subscriptionId); + subscriptionId);
@@ -3525,8 +3525,8 @@ public class SubscriptionManager {
* @param subscriptionId The unique Subscription ID in database * @param subscriptionId The unique Subscription ID in database
*/ */
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setDeviceToDeviceStatusSharingContacts(@NonNull List<Uri> contacts, public void setDeviceToDeviceStatusSharingContacts(int subscriptionId,
int subscriptionId) { @NonNull List<Uri> contacts) {
String contactString = serializeUriLists(contacts); String contactString = serializeUriLists(contacts);
if (VDBG) { if (VDBG) {
logd("[setDeviceToDeviceStatusSharingContacts] + contacts: " + contactString logd("[setDeviceToDeviceStatusSharingContacts] + contacts: " + contactString