commit d9ad63b9f7ead97e80d5e8478b67cbb3e4731308
author Svetoslav <svetoslavganov@google.com> Thu Oct 31 17:38:56 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 31 17:38:56 2013 -0700
tree dc722988533ee854975b2d80993e2909252d2ab4
parent 490cee69026308b6bf04d0a147c7208b254f3771
parent 186868941747b2fad1bdaea973d99ba62686517c

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

* commit '186868941747b2fad1bdaea973d99ba62686517c':
  Uninitialized UiAutomationConnection incorrectly enforces caller id.

core/java/android/app/UiAutomationConnection.java

diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java
index 607930c..91b0d7c 100644
--- a/core/java/android/app/UiAutomationConnection.java
+++ b/core/java/android/app/UiAutomationConnection.java
@@ -146,7 +146,9 @@
     @Override
     public void shutdown() {
         synchronized (mLock) {
-            throwIfCalledByNotTrustedUidLocked();
+            if (isConnectedLocked()) {
+                throwIfCalledByNotTrustedUidLocked();
+            }
             throwIfShutdownLocked();
             mIsShutdown = true;
             if (isConnectedLocked()) {