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

Revert "refactor radioPowerstate"

Browse Source 
This reverts commit 700c8a0389.

Reason for revert: Broken master build

Change-Id: Ia0171ff9250228cc03685e7f03da8dd9e374826f
This commit is contained in:
Przemyslaw Szczepaniak
2018-10-17 11:00:01 +00:00
parent 700c8a0389
commit 05188f3555
7 changed files with 0 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/system-current.txt
View File

@@ -5324,11 +5324,6 @@ package android.telephony {
field public static final int RESULT_SUCCESS = 0; // 0x0
}
public class PhoneStateListener {
method public void onRadioPowerStateChanged(int);
field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000
}
public class ServiceState implements android.os.Parcelable {
method public android.telephony.NetworkRegistrationState getNetworkRegistrationState(int, int);
method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
@@ -5456,7 +5451,6 @@ package android.telephony {
method public boolean getEmergencyCallbackMode();
method public java.lang.String getIsimDomain();
method public int getPreferredNetworkType(int);
method public int getRadioPowerState();
method public int getSimApplicationState();
method public int getSimCardState();
method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
@@ -5520,9 +5514,6 @@ package android.telephony {
field public static final int NETWORK_MODE_TDSCDMA_WCDMA = 14; // 0xe
field public static final int NETWORK_MODE_WCDMA_ONLY = 2; // 0x2
field public static final int NETWORK_MODE_WCDMA_PREF = 0; // 0x0
field public static final int RADIO_POWER_OFF = 0; // 0x0
field public static final int RADIO_POWER_ON = 1; // 0x1
field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2
field public static final int SIM_ACTIVATION_STATE_ACTIVATED = 2; // 0x2
field public static final int SIM_ACTIVATION_STATE_ACTIVATING = 1; // 0x1
field public static final int SIM_ACTIVATION_STATE_DEACTIVATED = 3; // 0x3

37
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -216,9 +216,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
private int mPreferredDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@TelephonyManager.RadioPowerState
private int mRadioPowerState = TelephonyManager.RADIO_POWER_UNAVAILABLE;
private final LocalLog mLocalLog = new LocalLog(100);
private PreciseDataConnectionState mPreciseDataConnectionState =
@@ -765,13 +762,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
remove(r.binder);
}
}
if ((events & PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED) != 0) {
try {
r.callback.onRadioPowerStateChanged(mRadioPowerState);
} catch (RemoteException ex) {
remove(r.binder);
}
}
}
}
} else {
@@ -1619,32 +1609,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
}
public void notifyRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
if (!checkNotifyPermission("notifyRadioPowerStateChanged()")) {
return;
}
if (VDBG) {
log("notifyRadioPowerStateChanged: state= " + state);
}
synchronized (mRecords) {
mRadioPowerState = state;
for (Record r : mRecords) {
if (r.matchPhoneStateListenerEvent(
PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED)) {
try {
r.callback.onRadioPowerStateChanged(state);
} catch (RemoteException ex) {
mRemoveList.add(r.binder);
}
}
}
handleRemoveListLocked();
}
}
@Override
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
@@ -1682,7 +1646,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
pw.println("mVoLteServiceState=" + mVoLteServiceState);
pw.println("mPhoneCapability=" + mPhoneCapability);
pw.println("mPreferredDataSubId=" + mPreferredDataSubId);
pw.println("mRadioPowerState=" + mRadioPowerState);
pw.decreaseIndent();

28
telephony/java/android/telephony/PhoneStateListener.java
View File

@@ -17,7 +17,6 @@
package android.telephony;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.Bundle;
import android.os.Handler;
@@ -292,15 +291,6 @@ public class PhoneStateListener {
*/
public static final int LISTEN_PREFERRED_DATA_SUBID_CHANGE = 0x00400000;
/**
* Listen for changes to the radio power state.
*
* @see #onRadioPowerStateChanged
* @hide
*/
@SystemApi
public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 0x00800000;
/*
* Subscription used to listen to the phone state changes
* @hide
@@ -430,9 +420,6 @@ public class PhoneStateListener {
case LISTEN_PREFERRED_DATA_SUBID_CHANGE:
PhoneStateListener.this.onPreferredDataSubIdChanged((int) msg.obj);
break;
case LISTEN_RADIO_POWER_STATE_CHANGED:
PhoneStateListener.this.onRadioPowerStateChanged((int) msg.obj);
break;
}
}
};
@@ -684,17 +671,6 @@ public class PhoneStateListener {
// default implementation empty
}
/**
* Callback invoked when modem radio power state changes. Requires
* the READ_PRIVILEGED_PHONE_STATE permission.
* @param state the modem radio power state
* @hide
*/
@SystemApi
public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
// default implementation empty
}
/**
* Callback invoked when telephony has received notice from a carrier
* app that a network action that could result in connectivity loss
@@ -831,10 +807,6 @@ public class PhoneStateListener {
send(LISTEN_PREFERRED_DATA_SUBID_CHANGE, 0, 0, subId);
}
public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
send(LISTEN_RADIO_POWER_STATE_CHANGED, 0, 0, state);
}
}
/**

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

@@ -6869,60 +6869,6 @@ public class TelephonyManager {
return false;
}
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"RADIO_POWER_"},
value = {RADIO_POWER_OFF,
RADIO_POWER_ON,
RADIO_POWER_UNAVAILABLE,
})
public @interface RadioPowerState {}
/**
* Radio explicitly powered off (e.g, airplane mode).
* @hide
*/
@SystemApi
public static final int RADIO_POWER_OFF = 0;
/**
* Radio power is on.
* @hide
*/
@SystemApi
public static final int RADIO_POWER_ON = 1;
/**
* Radio power unavailable (eg, modem resetting or not booted).
* @hide
*/
@SystemApi
public static final int RADIO_POWER_UNAVAILABLE = 2;
/**
* @return current modem radio state.
*
* <p>Requires permission: {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or
* {@link android.Manifest.permission#READ_PHONE_STATE} or that the calling
* app has carrier privileges (see {@link #hasCarrierPrivileges}).
*
* @hide
*/
@SystemApi
@RequiresPermission(anyOf = {android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE})
public @RadioPowerState int getRadioPowerState() {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getRadioPowerState(getSlotIndex(), mContext.getOpPackageName());
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.
}
return RADIO_POWER_UNAVAILABLE;
}
/** @hide */
@SystemApi
@SuppressLint("Doclava125")

1
telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl
View File

@@ -53,6 +53,5 @@ oneway interface IPhoneStateListener {
void onUserMobileDataStateChanged(in boolean enabled);
void onPhoneCapabilityChanged(in PhoneCapability capability);
void onPreferredDataSubIdChanged(in int subId);
void onRadioPowerStateChanged(in int state);
}

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -1499,10 +1499,4 @@ interface ITelephony {
* Set the default SMS app to a given package on a given user.
*/
void setDefaultSmsApp(int userId, String packageName);
/**
* Return the modem radio power state for slot index.
*
*/
int getRadioPowerState(int slotIndex, String callingPackage);
}

1
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -80,5 +80,4 @@ interface ITelephonyRegistry {
void notifyUserMobileDataStateChangedForPhoneId(in int phoneId, in int subId, in boolean state);
void notifyPhoneCapabilityChanged(in PhoneCapability capability);
void notifyPreferredDataSubIdChanged(int preferredSubId);
void notifyRadioPowerStateChanged(in int state);
}