From d05686b43164e16fa1ccf7dd6d7a292c7dec0bf5 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 1 Oct 2021 08:15:03 +0000 Subject: [PATCH] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" Revert submission 15220072-add_permission_wifidialog-qt-dev Reason for revert: rollback CLs to avoid compatibility risks Reverted Changes: I1535f6f2d:Add SafetyNet logging If7ca069c8:Add permission checking to WifiDialogActivity Bug: 185126813 Change-Id: I42b77ac420d9438c741b28ce33bcadf1c74b19eb --- src/com/android/settings/wifi/WifiDialogActivity.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 53c941e9c21..a2121908894 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -28,7 +28,6 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; -import android.util.EventLog; import android.util.Log; import androidx.annotation.VisibleForTesting; @@ -217,7 +216,6 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo final String callingPackage = getCallingPackage(); if (callingPackage == null) { Log.d(TAG, "Failed to get the calling package, don't return the result."); - EventLog.writeEvent(0x534e4554, "185126813", -1 /* UID */, "no calling package"); return false; } @@ -234,14 +232,6 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo } Log.d(TAG, "The calling package does not have the necessary permissions for result."); - try { - EventLog.writeEvent(0x534e4554, "185126813", - getPackageManager().getPackageUid(callingPackage, 0 /* flags */), - "no permission"); - } catch (PackageManager.NameNotFoundException e) { - EventLog.writeEvent(0x534e4554, "185126813", -1 /* UID */, "no permission"); - Log.w(TAG, "Cannot find the UID, calling package: " + callingPackage, e); - } return false; } }