Merge "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets" into marshmallow-cts-releaseandroid-cts-6.0_r9

1 files changed, 2 insertions, 7 deletions

diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java b/hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
index 40d3cff6c97..9f0abedbd40 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/src/com/android/cts/appaccessdata/AccessPrivateDataTest.java
@@ -103,24 +103,19 @@ public class AccessPrivateDataTest extends AndroidTestCase {
         } catch (SecurityException e) {
             fail("Was not able to access another app's public file: " + e);
         }
-
-        boolean foundOtherStats = false;
         try {
             BufferedReader qtaguidReader = new BufferedReader(new FileReader("/proc/net/xt_qtaguid/stats"));
             String line;
             while ((line = qtaguidReader.readLine()) != null) {
                 String tokens[] = line.split(" ");
                 if (tokens.length > 3 && tokens[3].equals(String.valueOf(otherAppUid))) {
-                    foundOtherStats = true;
-                    if (!tokens[2].equals("0x0")) {
-                        fail("Other apps detailed traffic stats leaked");
-                    }
+                    // CreatePrivateDataTest:testCreatePrivateData ensures we can access our own stats data
+                    fail("Other apps detailed traffic stats leaked");
                 }
             }
             qtaguidReader.close();
         } catch (FileNotFoundException e) {
             fail("Was not able to access qtaguid/stats: " + e);
         }
-        assertTrue("Was expecting to find other apps' traffic stats", foundOtherStats);
     }
 }