summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/UiAutomationConnection.java4
1 files changed, 3 insertions, 1 deletions
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 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub {
@Override
public void shutdown() {
synchronized (mLock) {
- throwIfCalledByNotTrustedUidLocked();
+ if (isConnectedLocked()) {
+ throwIfCalledByNotTrustedUidLocked();
+ }
throwIfShutdownLocked();
mIsShutdown = true;
if (isConnectedLocked()) {