Commit 4fa9ca7f authored Jan 12, 2017 by Martijn Coenen Committed by android-build-merger Jan 12, 2017

Merge "Don't print error if we can't talk to hwservicemanager." am: 53d36e44...

Merge "Don't print error if we can't talk to hwservicemanager." am: 53d36e44 am: c144b7da am: 63f8f36d
am: 12a615c8

Change-Id: If1facb53f01a7eb33dfdf70681c6de72fa4cef63

parents 41e08348 12a615c8

cmds/atrace/atrace.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -562,7 +562,8 @@ static void pokeHalServices()
		}
		});
		if (!listRet.isOk()) {
		fprintf(stderr, "failed to list services: %s\n", listRet.description().c_str());
		// TODO(b/34242478) fix this when we determine the correct ACL
		//fprintf(stderr, "failed to list services: %s\n", listRet.description().c_str());
		}
		}