diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-11-01 00:31:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-01 00:31:02 +0000 |
| commit | a84e1197f5deaed95cea48f8e103119dc4b36c1b (patch) | |
| tree | bb9cb801c57524cdd9786d1c79acabeea8a22235 | |
| parent | fbefe9bf741250f0ec2a538dbd11ab9f38a2c8f8 (diff) | |
| parent | 9663fd09e9dc14a17d3828665ab11a256c4a5c96 (diff) | |
| download | frameworks_base-a84e1197f5deaed95cea48f8e103119dc4b36c1b.zip frameworks_base-a84e1197f5deaed95cea48f8e103119dc4b36c1b.tar.gz frameworks_base-a84e1197f5deaed95cea48f8e103119dc4b36c1b.tar.bz2 | |
Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
| -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()) { |