LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the NPE thrown when starting Ethernet service in OS lower than T.

Browse Source 
Bug: 210586283
Bug: 223993229
Test: m
Merged-In: I5b61643cf99681e4db56468401e8670f90f9257e
Change-Id: If2c74bd5ed53fc571697145041413cbb85482177
This commit is contained in:
Xiao Ma
2022-03-16 03:25:25 +00:00
parent 1bc5454f41
commit 799d000c9f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-t/src/com/android/server/ConnectivityServiceInitializer.java
View File

@@ -31,7 +31,6 @@ import com.android.server.nearby.NearbyService;
*/
public final class ConnectivityServiceInitializer extends SystemService {
private static final String TAG = ConnectivityServiceInitializer.class.getSimpleName();
private final Context mContext;
private final ConnectivityService mConnectivity;
private final IpSecService mIpSecService;
private final NsdService mNsdService;
@@ -40,7 +39,6 @@ public final class ConnectivityServiceInitializer extends SystemService {
public ConnectivityServiceInitializer(Context context) {
super(context);
mContext = context;
// Load JNI libraries used by ConnectivityService and its dependencies
System.loadLibrary("service-connectivity");
mEthernetServiceImpl = createEthernetService(context);
@@ -52,7 +50,7 @@ public final class ConnectivityServiceInitializer extends SystemService {
@Override
public void onStart() {
if (mConnectivity.deviceSupportsEthernet(mContext)) {
if (mEthernetServiceImpl != null) {
Log.i(TAG, "Registering " + Context.ETHERNET_SERVICE);
publishBinderService(Context.ETHERNET_SERVICE, mEthernetServiceImpl,
/* allowIsolated= */ false);