diff options
| -rw-r--r-- | api/Android.bp | 19 | ||||
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 12 | ||||
| -rw-r--r-- | services/core/jni/Android.bp | 3 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 1 |
5 files changed, 29 insertions, 10 deletions
diff --git a/api/Android.bp b/api/Android.bp index ae0d59635e8f..471b9930eddb 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -57,6 +57,25 @@ genrule { } genrule { + name: "frameworks-base-api-current.srcjar", + srcs: [ + ":api-stubs-docs-non-updatable", + ":conscrypt.module.public.api{.public.stubs.source}", + ":framework-media{.public.stubs.source}", + ":framework-mediaprovider{.public.stubs.source}", + ":framework-permission{.public.stubs.source}", + ":framework-sdkextensions{.public.stubs.source}", + ":framework-statsd{.public.stubs.source}", + ":framework-tethering{.public.stubs.source}", + ":framework-wifi{.public.stubs.source}", + ], + out: ["current.srcjar"], + tools: ["merge_zips"], + cmd: "$(location merge_zips) $(out) $(in)", + visibility: ["//visibility:private"], // Used by make module in //development, mind. +} + +genrule { name: "frameworks-base-api-removed.txt", srcs: [ ":conscrypt.module.public.api{.public.removed-api.txt}", diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 7afe8b79f021..ef44d068862c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -184,6 +184,7 @@ import com.android.org.conscrypt.OpenSSLSocketImpl; import com.android.org.conscrypt.TrustedCertificateStore; import com.android.server.am.MemInfoDumpProto; +import dalvik.system.AppSpecializationHooks; import dalvik.system.CloseGuard; import dalvik.system.VMDebug; import dalvik.system.VMRuntime; @@ -6384,6 +6385,9 @@ public final class ActivityThread extends ClientTransactionHandler { Process.setStartTimes(SystemClock.elapsedRealtime(), SystemClock.uptimeMillis()); AppCompatCallbacks.install(data.disabledCompatChanges); + // Let libcore handle any compat changes after installing the list of compat changes. + AppSpecializationHooks.handleCompatChangesBeforeBindingApplication(); + mBoundApplication = data; mConfiguration = new Configuration(data.config); mCompatConfiguration = new Configuration(data.config); diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 9e43b5481739..8b56a2b64db2 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -25,6 +25,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED; import static android.net.RouteInfo.RTN_THROW; import static android.net.RouteInfo.RTN_UNREACHABLE; +import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkNotNull; import android.Manifest; @@ -2759,6 +2760,8 @@ public class Vpn { LegacyVpnRunner(VpnConfig config, String[] racoon, String[] mtpd, VpnProfile profile) { super(TAG); + checkArgument(racoon != null || mtpd != null, "Arguments to racoon and mtpd " + + "must not both be null"); mConfig = config; mDaemons = new String[] {"racoon", "mtpd"}; // TODO: clear arguments from memory once launched @@ -2915,15 +2918,6 @@ public class Vpn { } new File("/data/misc/vpn/abort").delete(); - // Check if we need to restart any of the daemons. - boolean restart = false; - for (String[] arguments : mArguments) { - restart = restart || (arguments != null); - } - if (!restart) { - agentDisconnect(); - return; - } updateState(DetailedState.CONNECTING, "execute"); // Start the daemon with arguments. diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index e8972742f8e2..22b51ccd1a63 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -26,7 +26,6 @@ cc_library_static { "stats/SubsystemSleepStatePuller.cpp", "com_android_server_adb_AdbDebuggingManager.cpp", "com_android_server_am_BatteryStatsService.cpp", - "com_android_server_connectivity_Vpn.cpp", "com_android_server_ConsumerIrService.cpp", "com_android_server_devicepolicy_CryptoTestHelper.cpp", "com_android_server_gpu_GpuService.cpp", @@ -60,6 +59,8 @@ cc_library_static { "com_android_server_pm_PackageManagerShellCommandDataLoader.cpp", "onload.cpp", ":lib_networkStatsFactory_native", + // TODO: move the file below to the connectivity APEX + "com_android_server_connectivity_Vpn.cpp", ], include_dirs: [ diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index d3c27dc4f255..91607462c29f 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -576,6 +576,7 @@ public interface RILConstants { int RIL_UNSOL_CARRIER_INFO_IMSI_ENCRYPTION = 1048; int RIL_UNSOL_NETWORK_SCAN_RESULT = 1049; int RIL_UNSOL_KEEPALIVE_STATUS = 1050; + int RIL_UNSOL_UNTHROTTLE_APN = 1052; /* The following unsols are not defined in RIL.h */ int RIL_UNSOL_HAL_NON_RIL_BASE = 1100; |