Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev

2013-11-01 00:31:02 +00:00
parent fbefe9bf74 9663fd09e9
commit a84e1197f5
1 changed files with 3 additions and 1 deletions
--- 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()) {