am 18686894: am acd8741d: am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
* commit '186868941747b2fad1bdaea973d99ba62686517c':
Uninitialized UiAutomationConnection incorrectly enforces caller id.
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()) {