From a0881d052ee72e3f7e773374e9b1aa75fbd6be4c Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 9 Jan 2009 17:50:54 -0800
Subject: auto import from //branches/cupcake/...@125939

---
 .../src/main/java/java/security/AccessControlContext.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'security-kernel/src')

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;
     }
-- 
cgit v1.1