Merge "[Passpoint] Changes required for bouncycastle update"
diff --git a/apex/Android.bp b/apex/Android.bp
index e65daa5..3fde6c8 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -37,6 +37,7 @@
"OsuLogin",
"ServiceWifiResources",
],
+ updatable: false,
}
filegroup {
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index b587eed..a28bd72 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -695,7 +695,13 @@
return startDaemon_V1_1();
} else {
Log.i(TAG, "Starting supplicant using init");
- mFrameworkFacade.startSupplicant();
+ try {
+ mFrameworkFacade.startSupplicant();
+ } catch (RuntimeException e) {
+ // likely a "failed to set system property" runtime exception
+ Log.e(TAG, "Failed to start supplicant using init", e);
+ return false;
+ }
return true;
}
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index 666b374..c974c4f 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -1556,18 +1556,9 @@
mMockLooper.dispatchAll();
inOrder.verify(mMockNetdWrapper).setInterfaceUp(anyString());
inOrder.verify(mMockNetdWrapper).enableIpv6(anyString());
- inOrder.verify(mMockCm).registerNetworkAgent(agentCaptor.capture(), any(),
- any(), netCapCaptor.capture(), anyInt(), any(), anyInt());
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.SUCCESS),
eq(useDirect), anyLong());
inOrderM.verify(mAwareMetricsMock).recordNdpCreation(anyInt(), any(), any());
- WifiAwareNetworkInfo netInfo =
- (WifiAwareNetworkInfo) netCapCaptor.getValue().getTransportInfo();
- assertArrayEquals(MacAddress.fromBytes(
- peerDataPathMac).getLinkLocalIpv6FromEui48Mac().getAddress(),
- netInfo.getPeerIpv6Addr().getAddress());
- assertEquals(0, netInfo.getPort());
- assertEquals(-1, netInfo.getTransportProtocol());
} else {
assertTrue(mAlarmManager.dispatch(
WifiAwareStateManager.HAL_DATA_PATH_CONFIRM_TIMEOUT_TAG));
@@ -1587,15 +1578,6 @@
endNetworkMsg.obj = nr;
res.mMessenger.send(endNetworkMsg);
- agentCaptor.getValue().onDisconnected();
-
- mDut.onEndDataPathResponse(transactionId.getValue(), true, 0);
- mDut.onDataPathEndNotification(ndpId);
- mMockLooper.dispatchAll();
-
- inOrder.verify(mMockNetdWrapper).setInterfaceDown(anyString());
- inOrder.verify(mMockNative).endDataPath(transactionId.capture(), eq(ndpId));
- inOrderM.verify(mAwareMetricsMock).recordNdpSessionDuration(anyLong());
}
} else {
verifyRequestDeclaredUnfullfillable(nr);
