diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-10-31 17:33:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-31 17:33:16 -0700 |
| commit | acd8741de6610bf3e2ec5ee682f7baa54d1fc383 (patch) | |
| tree | e8d36a088f3c5bc5d7d4c3cb0bb310a84305cf7c /core/java/android/app | |
| parent | de2d961ff83fbca65bebb9696551cbbc14cad6a5 (diff) | |
| parent | a84e1197f5deaed95cea48f8e103119dc4b36c1b (diff) | |
| download | frameworks_base-acd8741de6610bf3e2ec5ee682f7baa54d1fc383.zip frameworks_base-acd8741de6610bf3e2ec5ee682f7baa54d1fc383.tar.gz frameworks_base-acd8741de6610bf3e2ec5ee682f7baa54d1fc383.tar.bz2 | |
am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
* commit 'a84e1197f5deaed95cea48f8e103119dc4b36c1b':
Uninitialized UiAutomationConnection incorrectly enforces caller id.
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/UiAutomationConnection.java | 4 |
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()) { |