diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:50:54 -0800 |
| commit | a0881d052ee72e3f7e773374e9b1aa75fbd6be4c (patch) | |
| tree | 8a9462436077d0d906368cb21f521f1bf8a25500 /security-kernel/src | |
| parent | dd828f42a5c83b4270d4fbf6fce2da1878f1e84a (diff) | |
| download | libcore-a0881d052ee72e3f7e773374e9b1aa75fbd6be4c.zip libcore-a0881d052ee72e3f7e773374e9b1aa75fbd6be4c.tar.gz libcore-a0881d052ee72e3f7e773374e9b1aa75fbd6be4c.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'security-kernel/src')
| -rw-r--r-- | security-kernel/src/main/java/java/security/AccessControlContext.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security-kernel/src/main/java/java/security/AccessControlContext.java b/security-kernel/src/main/java/java/security/AccessControlContext.java index f9d883a..597cc44 100644 --- a/security-kernel/src/main/java/java/security/AccessControlContext.java +++ b/security-kernel/src/main/java/java/security/AccessControlContext.java @@ -228,9 +228,12 @@ public final class AccessControlContext { .matchSubset(that.context, context))) { return false; } - // 'combiner' is not taken into account - see the test - // AccessControllerTest.testEqualsObject_01 - return true; + // BEGIN android-changed + if(combiner != null) { + return combiner.equals(that.combiner); + } + return that.combiner == null; + // END android-changed } return false; } |