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

Remove hard-coded NetworkStack package name

Browse Source 
Have the network stack pass its package name in
showProvisioningNotification instead.

Bug: 124033493
Test: flashed, WiFi and captive portal works
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1f3312768ba1fb34e99a827e1fcdaf7510e318a8
This commit is contained in:
Remi NGUYEN VAN
2019-02-07 21:29:57 +09:00
parent b099846c86
commit 794c7f2ee3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -38,7 +38,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkPolicyManager.RULE_NONE; import static android.net.NetworkPolicyManager.RULE_NONE;
import static android.net.NetworkPolicyManager.uidRulesToString; import static android.net.NetworkPolicyManager.uidRulesToString;
import static android.net.NetworkStack.NETWORKSTACK_PACKAGE_NAME;
import static android.net.shared.NetworkMonitorUtils.isValidationRequired; import static android.net.shared.NetworkMonitorUtils.isValidationRequired;
import static android.net.shared.NetworkParcelableUtil.toStableParcelable; import static android.net.shared.NetworkParcelableUtil.toStableParcelable;
import static android.os.Process.INVALID_UID; import static android.os.Process.INVALID_UID;
@@ -2661,9 +2660,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
@Override @Override
public void showProvisioningNotification(String action) { public void showProvisioningNotification(String action, String packageName) {
final Intent intent = new Intent(action); final Intent intent = new Intent(action);
intent.setPackage(NETWORKSTACK_PACKAGE_NAME); intent.setPackage(packageName);
final PendingIntent pendingIntent; final PendingIntent pendingIntent;
// Only the system server can register notifications with package "android" // Only the system server can register notifications with package "android"

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -554,7 +554,7 @@ public class ConnectivityServiceTest {
if (mNmValidationRedirectUrl != null) { if (mNmValidationRedirectUrl != null) {
mNmCallbacks.showProvisioningNotification( mNmCallbacks.showProvisioningNotification(
"test_provisioning_notif_action"); "test_provisioning_notif_action", "com.android.test.package");
mNmProvNotificationRequested = true; mNmProvNotificationRequested = true;
} }
} catch (RemoteException e) { } catch (RemoteException e) {