Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12dcd503 authored by Weng Su's avatar Weng Su
Browse files

[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging" 

Revert submission 15207347-add_permission_wifidialog

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging

Bug: 185126813
Change-Id: I41721dbb34612144d00dba7885944d834bf93c7d
parent b9b493d3

src/com/android/settings/wifi/WifiDialogActivity.java

+0 −10
Original line number Diff line number Diff line
@@ -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;

    }

}