am 4993da92: Merge "Patches for IKeyguardStateCallback" (57e82aad) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+29 −17

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ import android.content.pm.UserInfo;
	import android.media.AudioManager;		import android.media.AudioManager;
	import android.media.SoundPool;		import android.media.SoundPool;
	import android.os.Bundle;		import android.os.Bundle;
			import android.os.DeadObjectException;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
	@@ -380,14 +381,17 @@ public class KeyguardViewMediator extends SystemUI {
	+ ",state=" + simState + ")");		+ ",state=" + simState + ")");
	}		}

	try {
	int size = mKeyguardStateCallbacks.size();		int size = mKeyguardStateCallbacks.size();
	boolean simPinSecure = mUpdateMonitor.isSimPinSecure();		boolean simPinSecure = mUpdateMonitor.isSimPinSecure();
	for (int i = 0; i < size; i++) {		for (int i = size - 1; i >= 0; i--) {
			try {
	mKeyguardStateCallbacks.get(i).onSimSecureStateChanged(simPinSecure);		mKeyguardStateCallbacks.get(i).onSimSecureStateChanged(simPinSecure);
	}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Failed to call onSimSecureStateChanged", e);		Slog.w(TAG, "Failed to call onSimSecureStateChanged", e);
			if (e instanceof DeadObjectException) {
			mKeyguardStateCallbacks.remove(i);
			}
			}
	}		}

	switch (simState) {		switch (simState) {
	@@ -540,6 +544,7 @@ public class KeyguardViewMediator extends SystemUI {

	// Assume keyguard is showing (unless it's disabled) until we know for sure...		// Assume keyguard is showing (unless it's disabled) until we know for sure...
	setShowingLocked(!shouldWaitForProvisioning() && !mLockPatternUtils.isLockScreenDisabled());		setShowingLocked(!shouldWaitForProvisioning() && !mLockPatternUtils.isLockScreenDisabled());
			updateInputRestrictedLocked();
	mTrustManager.reportKeyguardShowingChanged();		mTrustManager.reportKeyguardShowingChanged();

	mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager(mContext,		mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager(mContext,
	@@ -929,13 +934,16 @@ public class KeyguardViewMediator extends SystemUI {
	boolean inputRestricted = isInputRestricted();		boolean inputRestricted = isInputRestricted();
	if (mInputRestricted != inputRestricted) {		if (mInputRestricted != inputRestricted) {
	mInputRestricted = inputRestricted;		mInputRestricted = inputRestricted;
	try {
	int size = mKeyguardStateCallbacks.size();		int size = mKeyguardStateCallbacks.size();
	for (int i = 0; i < size; i++) {		for (int i = size - 1; i >= 0; i--) {
			try {
	mKeyguardStateCallbacks.get(i).onInputRestrictedStateChanged(inputRestricted);		mKeyguardStateCallbacks.get(i).onInputRestrictedStateChanged(inputRestricted);
	}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Failed to call onDeviceProvisioned", e);		Slog.w(TAG, "Failed to call onDeviceProvisioned", e);
			if (e instanceof DeadObjectException) {
			mKeyguardStateCallbacks.remove(i);
			}
			}
	}		}
	}		}
	}		}
	@@ -1531,13 +1539,16 @@ public class KeyguardViewMediator extends SystemUI {
	private void setShowingLocked(boolean showing) {		private void setShowingLocked(boolean showing) {
	if (showing != mShowing) {		if (showing != mShowing) {
	mShowing = showing;		mShowing = showing;
	try {
	int size = mKeyguardStateCallbacks.size();		int size = mKeyguardStateCallbacks.size();
	for (int i = 0; i < size; i++) {		for (int i = size - 1; i >= 0; i--) {
			try {
	mKeyguardStateCallbacks.get(i).onShowingStateChanged(showing);		mKeyguardStateCallbacks.get(i).onShowingStateChanged(showing);
	}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Failed to call onShowingStateChanged", e);		Slog.w(TAG, "Failed to call onShowingStateChanged", e);
			if (e instanceof DeadObjectException) {
			mKeyguardStateCallbacks.remove(i);
			}
			}
	}		}
	updateInputRestrictedLocked();		updateInputRestrictedLocked();
	mTrustManager.reportKeyguardShowingChanged();		mTrustManager.reportKeyguardShowingChanged();
	@@ -1550,8 +1561,9 @@ public class KeyguardViewMediator extends SystemUI {
	try {		try {
	callback.onSimSecureStateChanged(mUpdateMonitor.isSimPinSecure());		callback.onSimSecureStateChanged(mUpdateMonitor.isSimPinSecure());
	callback.onShowingStateChanged(mShowing);		callback.onShowingStateChanged(mShowing);
			callback.onInputRestrictedStateChanged(mInputRestricted);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Failed to call onShowingStateChanged or onSimSecureStateChanged", e);		Slog.w(TAG, "Failed to call onShowingStateChanged or onSimSecureStateChanged or onInputRestrictedStateChanged", e);
	}		}
	}		}
	}		}