Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (765378a4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1323,7 +1323,7 @@ public class Vpn {
		*/
		public synchronized void onUserStopped() {
		// Switch off networking lockdown (if it was enabled)
		setLockdown(false);
		setVpnForcedLocked(false);
		mAlwaysOn = false;

		unregisterPackageChangeReceiverLocked();

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2373,7 +2373,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		mContext, 0,
		Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER),
		mContext.getText(com.android.internal.R.string.chooser_wallpaper)),
		0, null, new UserHandle(serviceUserId)));
		PendingIntent.FLAG_IMMUTABLE, null, new UserHandle(serviceUserId)));
		if (!mContext.bindServiceAsUser(intent, newConn,
		Context.BIND_AUTO_CREATE \| Context.BIND_SHOWING_UI
		\| Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,

wifi/java/android/net/wifi/WifiManager.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -666,19 +666,26 @@ public class WifiManager {

		/**
		* Broadcast intent action indicating that the configured networks changed.
		* This can be as a result of adding/updating/deleting a network. If
		* {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is set to true the new configuration
		* can be retreived with the {@link #EXTRA_WIFI_CONFIGURATION} extra. If multiple
		* Wi-Fi configurations changed, {@link #EXTRA_WIFI_CONFIGURATION} will not be present.
		* This can be as a result of adding/updating/deleting a network.
		* <br />
		* {@link #EXTRA_CHANGE_REASON} contains whether the configuration was added/changed/removed.
		* {@link #EXTRA_WIFI_CONFIGURATION} is never set starting in Android 11.
		* {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is set for backwards compatibility reasons, but
		* its value is always true, even if only a single network changed.
		* <br />
		* The {@link android.Manifest.permission#ACCESS_WIFI_STATE ACCESS_WIFI_STATE} permission is
		* required to receive this broadcast.
		*
		* @hide
		*/
		@SystemApi
		public static final String CONFIGURED_NETWORKS_CHANGED_ACTION =
		"android.net.wifi.CONFIGURED_NETWORKS_CHANGE";
		/**
		* The lookup key for a (@link android.net.wifi.WifiConfiguration} object representing
		* The lookup key for a {@link android.net.wifi.WifiConfiguration} object representing
		* the changed Wi-Fi configuration when the {@link #CONFIGURED_NETWORKS_CHANGED_ACTION}
		* broadcast is sent.
		* Note: this extra is never set starting in Android 11.
		* @hide
		*/
		@SystemApi
		@@ -686,14 +693,16 @@ public class WifiManager {
		/**
		* Multiple network configurations have changed.
		* @see #CONFIGURED_NETWORKS_CHANGED_ACTION
		*
		* Note: this extra is always true starting in Android 11.
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";
		/**
		* The lookup key for an integer indicating the reason a Wi-Fi network configuration
		* has changed. Only present if {@link #EXTRA_MULTIPLE_NETWORKS_CHANGED} is {@code false}
		* has changed. One of {@link #CHANGE_REASON_ADDED}, {@link #CHANGE_REASON_REMOVED},
		* {@link #CHANGE_REASON_CONFIG_CHANGE}.
		*
		* @see #CONFIGURED_NETWORKS_CHANGED_ACTION
		* @hide
		*/