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

Commit 1a5feccb authored by Chen Chen's avatar Chen Chen Committed by android-build-merger
Browse files

Merge "Updateability: Resolve hidden api usages to android/net/NetworkUtils" 

am: 567a007c

Change-Id: I7115f6648627d28c14af8b0b4ec8586f30a98c3d
parents 8aa46711 567a007c

android/app/src/com/android/bluetooth/pan/PanService.java

+4 −4
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.Resources.NotFoundException;

import android.net.ConnectivityManager;

import android.net.InetAddresses;

import android.net.InterfaceConfiguration;

import android.net.LinkAddress;

import android.net.NetworkUtils;

import android.os.Handler;

import android.os.IBinder;

import android.os.INetworkManagementService;
@@ -664,10 +664,10 @@ public class PanService extends ProfileService { 
                InetAddress addr = null;

                LinkAddress linkAddr = ifcg.getLinkAddress();

                if (linkAddr == null || (addr = linkAddr.getAddress()) == null || addr.equals(

                        NetworkUtils.numericToInetAddress("0.0.0.0")) || addr.equals(

                        NetworkUtils.numericToInetAddress("::0"))) {

                        InetAddresses.parseNumericAddress("0.0.0.0")) || addr.equals(

                        InetAddresses.parseNumericAddress("::0"))) {

                    address = BLUETOOTH_IFACE_ADDR_START;

                    addr = NetworkUtils.numericToInetAddress(address);

                    addr = InetAddresses.parseNumericAddress(address);

                }



                ifcg.setLinkAddress(new LinkAddress(addr, BLUETOOTH_PREFIX_LENGTH));