Merge "Add ME Depersonalization support." (3c717b3a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CommandsInterface.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -746,7 +746,7 @@ public interface CommandsInterface {

		void changeBarringPassword(String facility, String oldPwd, String newPwd, Message result);

		void supplyNetworkDepersonalization(String netpin, Message result);
		void supplyDepersonalization(String netpin, String type, Message result);

		/**
		* returned message

src/java/com/android/internal/telephony/IccCard.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -61,10 +61,10 @@ public interface IccCard {
		public void unregisterForAbsent(Handler h);

		/**
		* Notifies handler of any transition into IccCardConstants.State.NETWORK_LOCKED
		* Notifies handler of any transition into IccCardConstants.State.PERSO_LOCKED
		*/
		public void registerForNetworkLocked(Handler h, int what, Object obj);
		public void unregisterForNetworkLocked(Handler h);
		public void registerForPersoLocked(Handler h, int what, Object obj);
		public void unregisterForPersoLocked(Handler h);

		/**
		* Notifies handler of any transition into IccCardConstants.State.isPinLocked()
		@@ -115,9 +115,9 @@ public interface IccCard {
		public boolean getIccFdnAvailable();

		/**
		* Supply Network depersonalization code to the RIL
		* Supply Depersonalization code to the RIL
		*/
		public void supplyNetworkDepersonalization (String pin, Message onComplete);
		public void supplyDepersonalization (String pin, String type, Message onComplete);

		/**
		* Check whether ICC pin lock is enabled

src/java/com/android/internal/telephony/RIL.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -883,12 +883,14 @@ public final class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void
		supplyNetworkDepersonalization(String netpin, Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, result);
		supplyDepersonalization(String netpin, String type, Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE, result);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) +
		" Type:" + type);

		rr.mParcel.writeInt(1);
		rr.mParcel.writeInt(2);
		rr.mParcel.writeString(type);
		rr.mParcel.writeString(netpin);

		send(rr);
		@@ -2482,7 +2484,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_REQUEST_ENTER_SIM_PUK2: ret = responseInts(p); break;
		case RIL_REQUEST_CHANGE_SIM_PIN: ret = responseInts(p); break;
		case RIL_REQUEST_CHANGE_SIM_PIN2: ret = responseInts(p); break;
		case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: ret = responseInts(p); break;
		case RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE: ret = responseInts(p); break;
		case RIL_REQUEST_GET_CURRENT_CALLS: ret = responseCallList(p); break;
		case RIL_REQUEST_DIAL: ret = responseVoid(p); break;
		case RIL_REQUEST_GET_IMSI: ret = responseString(p); break;
		@@ -3970,7 +3972,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_REQUEST_ENTER_SIM_PUK2: return "ENTER_SIM_PUK2";
		case RIL_REQUEST_CHANGE_SIM_PIN: return "CHANGE_SIM_PIN";
		case RIL_REQUEST_CHANGE_SIM_PIN2: return "CHANGE_SIM_PIN2";
		case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: return "ENTER_NETWORK_DEPERSONALIZATION";
		case RIL_REQUEST_ENTER_DEPERSONALIZATION_CODE: return "ENTER_DEPERSONALIZATION_CODE";
		case RIL_REQUEST_GET_CURRENT_CALLS: return "GET_CURRENT_CALLS";
		case RIL_REQUEST_DIAL: return "DIAL";
		case RIL_REQUEST_GET_IMSI: return "GET_IMSI";

src/java/com/android/internal/telephony/sip/SipCommandInterface.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface {
		}

		@Override
		public void supplyNetworkDepersonalization(String netpin, Message result) {
		public void supplyDepersonalization(String netpin, String type, Message result) {
		}

		@Override

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -442,7 +442,7 @@ public final class SimulatedCommands extends BaseCommands
		}

		@Override
		public void supplyNetworkDepersonalization(String netpin, Message result) {
		public void supplyDepersonalization(String netpin, String type, Message result) {
		unimplemented(result);
		}