[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
This commit is contained in:
Weng Su
2021-10-01 08:15:03 +00:00
parent 6718e1ee7b
commit d05686b431

View File

@@ -28,7 +28,6 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.ActionListener; import android.net.wifi.WifiManager.ActionListener;
import android.os.Bundle; import android.os.Bundle;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -217,7 +216,6 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
final String callingPackage = getCallingPackage(); final String callingPackage = getCallingPackage();
if (callingPackage == null) { if (callingPackage == null) {
Log.d(TAG, "Failed to get the calling package, don't return the result."); 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; 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."); 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; return false;
} }
} }