Merge "Fix null pointer exception in KeyguardUpdateMonitor." (6474bdf5) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -465,8 +465,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
	} else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {		} else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
	Log.d(TAG, "Received CONFIGURATION_CHANGED intent");		Log.d(TAG, "Received CONFIGURATION_CHANGED intent");
	for (int i = 0; i < mNumPhones; i++) {		for (int i = 0; i < mNumPhones; i++) {
	long subId = SubscriptionManager.getSubId(i)[0];		long[] subIds = SubscriptionManager.getSubId(i);
	mHandler.sendMessage(mHandler.obtainMessage(MSG_CARRIER_INFO_UPDATE, subId));		if (subIds != null && subIds.length > 0) {
			mHandler.sendMessage(mHandler.obtainMessage(MSG_CARRIER_INFO_UPDATE,
			subIds[0]));
			} else {
			Log.d(TAG, "No valid subs");
			}
	}		}
	}		}