Fix broken build
I84433729448f32fc1eea4d93bc9ad6b99252608b broke the build due to an
incorrect Merged-in line containing an extra "CHANGE-ID", which caused
the automerger to merge it and hit an unlucky double merge of a hunk.
Undo the double merge to fix the build.
Test: mma -j
Change-Id: I08a164b1653265d2ec3292dafa452cbc2130672c
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6e24619..fee2952 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2096,66 +2096,6 @@
}
/**
- * Sets the voice activation state of a given subId.
- */
- @Override
- public void setVoiceActivationState(int subId, int activationState) {
- enforceModifyPermissionOrCarrierPrivilege(subId);
- final Phone phone = getPhone(subId);
- if (phone != null) {
- phone.setVoiceActivationState(activationState);
- } else {
- loge("setVoiceActivationState fails with invalid subId: " + subId);
- }
- }
-
- /**
- * Sets the data activation state of a given subId.
- */
- @Override
- public void setDataActivationState(int subId, int activationState) {
- enforceModifyPermissionOrCarrierPrivilege(subId);
- final Phone phone = getPhone(subId);
- if (phone != null) {
- phone.setDataActivationState(activationState);
- } else {
- loge("setVoiceActivationState fails with invalid subId: " + subId);
- }
- }
-
- /**
- * Returns the voice activation state of a given subId.
- */
- @Override
- public int getVoiceActivationState(int subId, String callingPackage) {
- if (!canReadPhoneState(callingPackage, "getVoiceActivationStateForSubscriber")) {
- return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
- }
- final Phone phone = getPhone(subId);
- if (phone != null) {
- return phone.getVoiceActivationState();
- } else {
- return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
- }
- }
-
- /**
- * Returns the data activation state of a given subId.
- */
- @Override
- public int getDataActivationState(int subId, String callingPackage) {
- if (!canReadPhoneState(callingPackage, "getDataActivationStateForSubscriber")) {
- return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
- }
- final Phone phone = getPhone(subId);
- if (phone != null) {
- return phone.getDataActivationState();
- } else {
- return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
- }
- }
-
- /**
* Returns the unread count of voicemails
*/
public int getVoiceMessageCount() {