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

Commit 5e288b9c authored by xshu's avatar xshu
Browse files

DevicePolicyManager get factory MAC 

Since MAC randomization will be randomized by default in Q,
which means the current MAC could change arbitrarily, the
existing API need to be modified to always get the factory MAC.

Bug: 111634904
Test: atest DevicePolicyManagerTest
Change-Id: I91a150fe4439ecef3836abb3c1ed087837a5fc67
parent 9a7f853b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −5
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ import android.net.NetworkUtils; 
import android.net.ProxyInfo;

import android.net.Uri;

import android.net.metrics.IpConnectivityLog;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.os.Binder;

import android.os.Build;
@@ -11828,16 +11827,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














        final long ident = mInjector.binderClearCallingIdentity();















        try {













            final WifiInfo wifiInfo = mInjector.getWifiManager().getConnectionInfo();













            if (wifiInfo == null) {













            String[] macAddresses = mInjector.getWifiManager().getFactoryMacAddresses();













            if (macAddresses == null) {















                return null;















            }













            final String result = wifiInfo.hasRealMacAddress() ? wifiInfo.getMacAddress() : null;















            DevicePolicyEventLogger















                    .createEvent(DevicePolicyEnums.GET_WIFI_MAC_ADDRESS)















                    .setAdmin(admin)















                    .write();













            return result;













            return macAddresses.length > 0 ? macAddresses[0] : null;















        } finally {















            mInjector.binderRestoreCallingIdentity(ident);















        }