diff -r b3a1d9898418 -r 95f71bcdcdb7 halservices/hal/tsrc/t_newhal.cpp --- a/halservices/hal/tsrc/t_newhal.cpp Fri May 14 17:13:29 2010 +0300 +++ b/halservices/hal/tsrc/t_newhal.cpp Thu May 27 14:17:14 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of the License "Eclipse Public License v1.0" @@ -236,8 +236,11 @@ } else { - test.Printf(_L("Attribute %S not supported on this platform or requires parameter\n"),&att_name,r); - test(r==KErrNotSupported || r==KErrArgument); + test.Printf(_L("Attribute %S not supported on this platform or requires parameter: r==%d\n"),&att_name,r); + // For some reason the following attribtues come back "KErrNone" on + // emulator...so guard added + if (i != HALData::EDisplayMemoryHandle) + test(r==KErrNotSupported || r==KErrArgument); } } User::Free(pE);