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

Merge "Rename ANS to ONS" am: c78240df19

Browse Source 
am: ac483b306d

Change-Id: I8714b3f7b4c71d817d2a8e8361442f720bf5a5a2
This commit is contained in:
Sooraj Sasindran
2019-01-12 11:37:42 -08:00
committed by android-build-merger
parent fb9e440baf ac483b306d
commit a951bbe072
3 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -553,7 +553,7 @@ java_defaults {
"telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl",
"telephony/java/com/android/internal/telephony/ISms.aidl",
"telephony/java/com/android/internal/telephony/ISub.aidl",
"telephony/java/com/android/internal/telephony/IAns.aidl",
"telephony/java/com/android/internal/telephony/IOns.aidl",
"telephony/java/com/android/internal/telephony/ITelephony.aidl",
"telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl",
"telephony/java/com/android/internal/telephony/IWapPushManager.aidl",

56
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -76,8 +76,8 @@ import com.android.ims.internal.IImsServiceFeatureCallback;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telecom.ITelecomService;
import com.android.internal.telephony.CellNetworkScanResult;
import com.android.internal.telephony.IAns;
import com.android.internal.telephony.INumberVerificationCallback;
import com.android.internal.telephony.IOns;
import com.android.internal.telephony.IPhoneSubInfo;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.ITelephonyRegistry;
@@ -4624,8 +4624,8 @@ public class TelephonyManager {
return ITelephonyRegistry.Stub.asInterface(ServiceManager.getService("telephony.registry"));
}
private IAns getIAns() {
return IAns.Stub.asInterface(ServiceManager.getService("ians"));
private IOns getIOns() {
return IOns.Stub.asInterface(ServiceManager.getService("ions"));
}
//
@@ -9103,10 +9103,10 @@ public class TelephonyManager {
}
/**
* Enable or disable AlternativeNetworkService.
* Enable or disable OpportunisticNetworkService.
*
* This method should be called to enable or disable
* AlternativeNetwork service on the device.
* OpportunisticNetwork service on the device.
*
* <p>
* Requires Permission:
@@ -9117,25 +9117,25 @@ public class TelephonyManager {
* @hide
*/
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public boolean setAlternativeNetworkState(boolean enable) {
public boolean setOpportunisticNetworkState(boolean enable) {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean ret = false;
try {
IAns iAlternativeNetworkService = getIAns();
if (iAlternativeNetworkService != null) {
ret = iAlternativeNetworkService.setEnable(enable, pkgForDebug);
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
ret = iOpportunisticNetworkService.setEnable(enable, pkgForDebug);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "enableAlternativeNetwork RemoteException", ex);
Rlog.e(TAG, "enableOpportunisticNetwork RemoteException", ex);
}
return ret;
}
/**
* is AlternativeNetworkService enabled
* is OpportunisticNetworkService enabled
*
* This method should be called to determine if the AlternativeNetworkService is
* This method should be called to determine if the OpportunisticNetworkService is
* enabled
*
* <p>
@@ -9144,17 +9144,17 @@ public class TelephonyManager {
* @hide
*/
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public boolean isAlternativeNetworkEnabled() {
public boolean isOpportunisticNetworkEnabled() {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean isEnabled = false;
try {
IAns iAlternativeNetworkService = getIAns();
if (iAlternativeNetworkService != null) {
isEnabled = iAlternativeNetworkService.isEnabled(pkgForDebug);
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
isEnabled = iOpportunisticNetworkService.isEnabled(pkgForDebug);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "enableAlternativeNetwork RemoteException", ex);
Rlog.e(TAG, "enableOpportunisticNetwork RemoteException", ex);
}
return isEnabled;
@@ -9509,9 +9509,9 @@ public class TelephonyManager {
public boolean setPreferredOpportunisticDataSubscription(int subId) {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
try {
IAns iAlternativeNetworkService = getIAns();
if (iAlternativeNetworkService != null) {
return iAlternativeNetworkService.setPreferredData(subId, pkgForDebug);
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
return iOpportunisticNetworkService.setPreferredData(subId, pkgForDebug);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "setPreferredData RemoteException", ex);
@@ -9533,9 +9533,9 @@ public class TelephonyManager {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
try {
IAns iAlternativeNetworkService = getIAns();
if (iAlternativeNetworkService != null) {
subId = iAlternativeNetworkService.getPreferredData(pkgForDebug);
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
subId = iOpportunisticNetworkService.getPreferredData(pkgForDebug);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getPreferredData RemoteException", ex);
@@ -9546,8 +9546,8 @@ public class TelephonyManager {
/**
* Update availability of a list of networks in the current location.
*
* This api should be called to inform AlternativeNetwork Service about the availability
* of a network at the current location. This information will be used by AlternativeNetwork
* This api should be called to inform OpportunisticNetwork Service about the availability
* of a network at the current location. This information will be used by OpportunisticNetwork
* service to decide to attach to the network opportunistically. If an empty list is passed,
* it is assumed that no network is available.
* Requires that the calling app has carrier privileges on both primary and
@@ -9562,9 +9562,9 @@ public class TelephonyManager {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
boolean ret = false;
try {
IAns iAlternativeNetworkService = getIAns();
if (iAlternativeNetworkService != null) {
ret = iAlternativeNetworkService.updateAvailableNetworks(availableNetworks,
IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService != null) {
ret = iOpportunisticNetworkService.updateAvailableNetworks(availableNetworks,
pkgForDebug);
}
} catch (RemoteException ex) {

12
telephony/java/com/android/internal/telephony/IAns.aidl → telephony/java/com/android/internal/telephony/IOns.aidl
View File

@@ -18,13 +18,13 @@ package com.android.internal.telephony;
import android.telephony.AvailableNetworkInfo;
interface IAns {
interface IOns {
/**
* Enable or disable Alternative Network service.
* Enable or disable Opportunistic Network service.
*
* This method should be called to enable or disable
* AlternativeNetwork service on the device.
* OpportunisticNetwork service on the device.
*
* <p>
* Requires Permission:
@@ -38,9 +38,9 @@ interface IAns {
boolean setEnable(boolean enable, String callingPackage);
/**
* is Alternative Network service enabled
* is Opportunistic Network service enabled
*
* This method should be called to determine if the Alternative Network service is enabled
* This method should be called to determine if the Opportunistic Network service is enabled
*
* <p>
* Requires Permission:
@@ -84,7 +84,7 @@ interface IAns {
* Update availability of a list of networks in the current location.
*
* This api should be called if the caller is aware of the availability of a network
* at the current location. This information will be used by AlternativeNetwork service
* at the current location. This information will be used by OpportunisticNetwork service
* to decide to attach to the network. If an empty list is passed,
* it is assumed that no network is available.
* Requires that the calling app has carrier privileges on both primary and