am acd8741d: am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev

* commit 'acd8741de6610bf3e2ec5ee682f7baa54d1fc383':
  Uninitialized UiAutomationConnection incorrectly enforces caller id.
This commit is contained in:
Svetoslav
2013-10-31 17:35:50 -07:00
committed by Android Git Automerger

View File

@@ -146,7 +146,9 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub {
@Override
public void shutdown() {
synchronized (mLock) {
throwIfCalledByNotTrustedUidLocked();
if (isConnectedLocked()) {
throwIfCalledByNotTrustedUidLocked();
}
throwIfShutdownLocked();
mIsShutdown = true;
if (isConnectedLocked()) {