Compilation fixes on new AoSP (f5e50081) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		try {
		Log.v(TAG, "call supplyPinReportResultUsingSubId() mSubId = " + mSubId);
		final int[] result = ITelephony.Stub.asInterface(ServiceManager
		.checkService("phone")).supplyPinReportResultUsingSubId(mSubId, mPin);
		.checkService("phone")).supplyPinReportResultForSubscriber(mSubId, mPin);
		Log.v(TAG, "supplyPinReportResultUsingSubId returned: " + result[0] +
		" " + result[1]);
		post(new Runnable() {
		@@ -345,9 +345,9 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		private void handleSubInfoChange() {
		String displayName = null;
		//get Display Name
		SubInfoRecord info = SubscriptionManager.getSubInfoUsingSubId(mSubId);
		SubInfoRecord info = SubscriptionManager.getSubInfoForSubscriber(mSubId);
		if (null != info) {
		displayName = info.mDisplayName;
		displayName = info.displayName;
		}
		if (DEBUG) Log.i(TAG, "handleSubInfoChange, mSubId=" + mSubId +
		", displayName=" + displayName);
		@@ -364,8 +364,8 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		if (DEBUG) Log.d(TAG, "handleSubInfoChange, refresh Sub Info for mSubId=" + mSubId);
		Drawable bgDrawable = null;
		if (null != info) {
		if (info.mSimIconRes[0] > 0) {
		bgDrawable = getContext().getResources().getDrawable(info.mSimIconRes[0]);
		if (info.simIconRes[0] > 0) {
		bgDrawable = getContext().getResources().getDrawable(info.simIconRes[0]);
		}
		}
		mSubDisplayName.setBackground(bgDrawable);

+5 −5

Original line number	Diff line number	Diff line
		@@ -263,7 +263,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		try {
		Log.v(TAG, "call supplyPukReportResultUsingSubId() mSubId = " + mSubId);
		final int[] result = ITelephony.Stub.asInterface(ServiceManager
		.checkService("phone")).supplyPukReportResultUsingSubId(mSubId, mPuk, mPin);
		.checkService("phone")).supplyPukReportResultForSubscriber(mSubId, mPuk, mPin);
		Log.v(TAG, "supplyPukReportResultUsingSubId returned: " + result[0] +
		" " + result[1]);
		post(new Runnable() {
		@@ -418,9 +418,9 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		private void handleSubInfoChange() {
		String displayName = null;
		//get Display Name
		SubInfoRecord info = SubscriptionManager.getSubInfoUsingSubId(mSubId);
		SubInfoRecord info = SubscriptionManager.getSubInfoForSubscriber(mSubId);
		if (null != info) {
		displayName = info.mDisplayName;
		displayName = info.displayName;
		}
		if (DEBUG) Log.i(TAG, "handleSubInfoChange, mSubId=" + mSubId +
		", displayName=" + displayName);
		@@ -437,8 +437,8 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		if (DEBUG) Log.d(TAG, "handleSubInfoChange, refresh Sub Info for mSubId=" + mSubId);
		Drawable bgDrawable = null;
		if (null != info) {
		if (info.mSimIconRes[0] > 0) {
		bgDrawable = getContext().getResources().getDrawable(info.mSimIconRes[0]);
		if (info.simIconRes[0] > 0) {
		bgDrawable = getContext().getResources().getDrawable(info.simIconRes[0]);
		}
		}
		mSubDisplayName.setBackground(bgDrawable);

+8 −8

Original line number	Diff line number	Diff line
		@@ -635,24 +635,24 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		for (SubInfoRecord subInfo: activeSubInfos) {
		//subId for the slot initially initiazed to invalid value
		//Got intent with correct subId for the slot now.
		if (mSubIdForSlot[subInfo.mSlotId] != subInfo.mSubId) {
		long subId = mSubIdForSlot[subInfo.mSlotId];
		mSimState.put(subInfo.mSubId, mSimState.get(subId));
		mPlmn.put(subInfo.mSubId, mPlmn.get(subId));
		mSpn.put(subInfo.mSubId, mSpn.get(subId));
		if (mSubIdForSlot[subInfo.slotId] != subInfo.subId) {
		long subId = mSubIdForSlot[subInfo.slotId];
		mSimState.put(subInfo.subId, mSimState.get(subId));
		mPlmn.put(subInfo.subId, mPlmn.get(subId));
		mSpn.put(subInfo.subId, mSpn.get(subId));

		final int count = mCallbacks.size();
		for (int i = 0; i < count; i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		cb.onSubIdUpdated(subId, subInfo.mSubId);
		cb.onSubIdUpdated(subId, subInfo.subId);
		}
		}
		}
		mSubIdForSlot[subInfo.mSlotId] = subInfo.mSubId;
		mSubIdForSlot[subInfo.slotId] = subInfo.subId;
		if (DEBUG) {
		Log.d(TAG, "handleSubInfoRecordUpdate mSubIdForSlot["
		+ subInfo.mSlotId + "] = " + subInfo.mSubId);
		+ subInfo.slotId + "] = " + subInfo.subId);
		}
		}
		} else {

+0 −2

Original line number	Diff line number	Diff line
		@@ -297,8 +297,6 @@ public class PhoneAccount implements Parcelable {
		return dsda.get(bit);
		}

		public static Builder builder() { return new Builder(); }

		/**
		* Returns a builder initialized with the current {@link PhoneAccount} instance.
		*