Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716,... (2a21bea4) · Commits · e / os / android_frameworks_base

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -121,8 +121,8 @@ public class GpsNetInitiatedHandler {
		static private boolean mIsHexInput = true;

		// End time of emergency call, and extension, if set
		private long mCallEndElapsedRealtimeMillis = 0;
		private long mEmergencyExtensionMillis = 0;
		private volatile long mCallEndElapsedRealtimeMillis = 0;
		private volatile long mEmergencyExtensionMillis = 0;

		public static class GpsNiNotification
		{
		@@ -245,8 +245,9 @@ public class GpsNetInitiatedHandler {
		*/
		public boolean getInEmergency() {
		boolean isInEmergencyExtension =
		(SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) <
		mEmergencyExtensionMillis;
		(mCallEndElapsedRealtimeMillis > 0)
		&& ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis)
		< mEmergencyExtensionMillis);
		boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
		return mIsInEmergencyCall \|\| isInEmergencyCallback \|\| isInEmergencyExtension;
		}

services/core/java/com/android/server/ConnectivityService.java

+5 −50

Original line number	Diff line number	Diff line
		@@ -867,8 +867,7 @@ public class ConnectivityService extends IConnectivityManager.Stub

		mPermissionMonitor = new PermissionMonitor(mContext, mNetd);

		// Set up the listener for user state for creating user VPNs.
		// Should run on mHandler to avoid any races.
		//set up the listener for user state for creating user VPNs
		IntentFilter intentFilter = new IntentFilter();
		intentFilter.addAction(Intent.ACTION_USER_STARTED);
		intentFilter.addAction(Intent.ACTION_USER_STOPPED);
		@@ -876,11 +875,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		intentFilter.addAction(Intent.ACTION_USER_REMOVED);
		intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);
		mContext.registerReceiverAsUser(
		mUserIntentReceiver,
		UserHandle.ALL,
		intentFilter,
		null /* broadcastPermission */,
		mHandler);
		mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null);
		mContext.registerReceiverAsUser(mUserPresentReceiver, UserHandle.SYSTEM,
		new IntentFilter(Intent.ACTION_USER_PRESENT), null, null);

		@@ -3820,27 +3815,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
		* handler thread through their agent, this is asynchronous. When the capabilities objects
		* are computed they will be up-to-date as they are computed synchronously from here and
		* this is running on the ConnectivityService thread.
		* TODO : Fix this and call updateCapabilities inline to remove out-of-order events.
		*/
		private void updateAllVpnsCapabilities() {
		Network defaultNetwork = getNetwork(getDefaultNetwork());
		synchronized (mVpns) {
		for (int i = 0; i < mVpns.size(); i++) {
		final Vpn vpn = mVpns.valueAt(i);
		NetworkCapabilities nc = vpn.updateCapabilities(defaultNetwork);
		updateVpnCapabilities(vpn, nc);
		vpn.updateCapabilities();
		}
		}
		}

		private void updateVpnCapabilities(Vpn vpn, @Nullable NetworkCapabilities nc) {
		ensureRunningOnConnectivityServiceThread();
		NetworkAgentInfo vpnNai = getNetworkAgentInfoForNetId(vpn.getNetId());
		if (vpnNai == null \|\| nc == null) {
		return;
		}
		updateCapabilities(vpnNai.getCurrentScore(), vpnNai, nc);
		}

		@Override
		public boolean updateLockdownVpn() {
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		@@ -4147,27 +4132,21 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		private void onUserAdded(int userId) {
		Network defaultNetwork = getNetwork(getDefaultNetwork());
		synchronized (mVpns) {
		final int vpnsSize = mVpns.size();
		for (int i = 0; i < vpnsSize; i++) {
		Vpn vpn = mVpns.valueAt(i);
		vpn.onUserAdded(userId);
		NetworkCapabilities nc = vpn.updateCapabilities(defaultNetwork);
		updateVpnCapabilities(vpn, nc);
		}
		}
		}

		private void onUserRemoved(int userId) {
		Network defaultNetwork = getNetwork(getDefaultNetwork());
		synchronized (mVpns) {
		final int vpnsSize = mVpns.size();
		for (int i = 0; i < vpnsSize; i++) {
		Vpn vpn = mVpns.valueAt(i);
		vpn.onUserRemoved(userId);
		NetworkCapabilities nc = vpn.updateCapabilities(defaultNetwork);
		updateVpnCapabilities(vpn, nc);
		}
		}
		}
		@@ -4186,7 +4165,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		private BroadcastReceiver mUserIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		ensureRunningOnConnectivityServiceThread();
		final String action = intent.getAction();
		final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
		if (userId == UserHandle.USER_NULL) return;
		@@ -4672,19 +4650,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		return getNetworkForRequest(mDefaultRequest.requestId);
		}

		@Nullable
		private Network getNetwork(@Nullable NetworkAgentInfo nai) {
		return nai != null ? nai.network : null;
		}

		private void ensureRunningOnConnectivityServiceThread() {
		if (mHandler.getLooper().getThread() != Thread.currentThread()) {
		throw new IllegalStateException(
		"Not running on ConnectivityService thread: "
		+ Thread.currentThread().getName());
		}
		}

		private boolean isDefaultNetwork(NetworkAgentInfo nai) {
		return nai == getDefaultNetwork();
		}
		@@ -5232,8 +5197,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		updateTcpBufferSizes(newNetwork);
		mDnsManager.setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers());
		notifyIfacesChangedForNetworkStats();
		// Fix up the NetworkCapabilities of any VPNs that don't specify underlying networks.
		updateAllVpnsCapabilities();
		}

		private void processListenRequests(NetworkAgentInfo nai, boolean capabilitiesChanged) {
		@@ -5667,10 +5630,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		// doing.
		updateSignalStrengthThresholds(networkAgent, "CONNECT", null);

		if (networkAgent.isVPN()) {
		updateAllVpnsCapabilities();
		}

		// Consider network even though it is not yet validated.
		final long now = SystemClock.elapsedRealtime();
		rematchNetworkAndRequests(networkAgent, ReapUnvalidatedNetworks.REAP, now);
		@@ -5864,11 +5823,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		success = mVpns.get(user).setUnderlyingNetworks(networks);
		}
		if (success) {
		mHandler.post(() -> {
		// Update VPN's capabilities based on updated underlying network set.
		updateAllVpnsCapabilities();
		notifyIfacesChangedForNetworkStats();
		});
		mHandler.post(() -> notifyIfacesChangedForNetworkStats());
		}
		return success;
		}

services/core/java/com/android/server/am/ActivityStack.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -2494,7 +2494,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai

		if (prev != null && prev != next) {
		if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)
		&& next != null && !next.nowVisible) {
		&& next != null && !next.nowVisible
		&& checkKeyguardVisibility(next, true /* shouldBeVisible */,
		next.isTopRunningActivity())) {
		mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(prev);
		if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,
		"Resuming top, waiting visible to hide: " + prev);

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

+14 −52

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ public class Vpn {
		mNetworkCapabilities = new NetworkCapabilities();
		mNetworkCapabilities.addTransportType(NetworkCapabilities.TRANSPORT_VPN);
		mNetworkCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
		updateCapabilities(null /* defaultNetwork */);
		updateCapabilities();

		loadAlwaysOnPackage();
		}
		@@ -300,39 +300,18 @@ public class Vpn {
		updateAlwaysOnNotification(detailedState);
		}

		/**
		* Updates {@link #mNetworkCapabilities} based on current underlying networks and returns a
		* defensive copy.
		*
		* <p>Does not propagate updated capabilities to apps.
		*
		* @param defaultNetwork underlying network for VPNs following platform's default
		*/
		public synchronized NetworkCapabilities updateCapabilities(
		@Nullable Network defaultNetwork) {
		if (mConfig == null) {
		// VPN is not running.
		return null;
		}

		Network[] underlyingNetworks = mConfig.underlyingNetworks;
		if (underlyingNetworks == null && defaultNetwork != null) {
		// null underlying networks means to track the default.
		underlyingNetworks = new Network[] { defaultNetwork };
		}

		applyUnderlyingCapabilities(
		mContext.getSystemService(ConnectivityManager.class),
		underlyingNetworks,
		public void updateCapabilities() {
		final Network[] underlyingNetworks = (mConfig != null) ? mConfig.underlyingNetworks : null;
		updateCapabilities(mContext.getSystemService(ConnectivityManager.class), underlyingNetworks,
		mNetworkCapabilities);

		return new NetworkCapabilities(mNetworkCapabilities);
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(mNetworkCapabilities);
		}
		}

		@VisibleForTesting
		public static void applyUnderlyingCapabilities(
		ConnectivityManager cm,
		Network[] underlyingNetworks,
		public static void updateCapabilities(ConnectivityManager cm, Network[] underlyingNetworks,
		NetworkCapabilities caps) {
		int[] transportTypes = new int[] { NetworkCapabilities.TRANSPORT_VPN };
		int downKbps = NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;
		@@ -344,7 +323,6 @@ public class Vpn {
		boolean hadUnderlyingNetworks = false;
		if (null != underlyingNetworks) {
		for (Network underlying : underlyingNetworks) {
		// TODO(b/124469351): Get capabilities directly from ConnectivityService instead.
		final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying);
		if (underlyingCaps == null) continue;
		hadUnderlyingNetworks = true;
		@@ -1015,8 +993,9 @@ public class Vpn {
		}

		/**
		* Establish a VPN network and return the file descriptor of the VPN interface. This methods
		* returns {@code null} if the application is revoked or not prepared.
		* Establish a VPN network and return the file descriptor of the VPN
		* interface. This methods returns {@code null} if the application is
		* revoked or not prepared.
		*
		* @param config The parameters to configure the network.
		* @return The file descriptor of the VPN interface.
		@@ -1263,11 +1242,6 @@ public class Vpn {
		return ranges;
		}

		/**
		* Updates UID ranges for this VPN and also updates its internal capabilities.
		*
		* <p>Should be called on primary ConnectivityService thread.
		*/
		public void onUserAdded(int userHandle) {
		// If the user is restricted tie them to the parent user's VPN
		UserInfo user = UserManager.get(mContext).getUserInfo(userHandle);
		@@ -1278,9 +1252,8 @@ public class Vpn {
		try {
		addUserToRanges(existingRanges, userHandle, mConfig.allowedApplications,
		mConfig.disallowedApplications);
		// ConnectivityService will call {@link #updateCapabilities} and apply
		// those for VPN network.
		mNetworkCapabilities.setUids(existingRanges);
		updateCapabilities();
		} catch (Exception e) {
		Log.wtf(TAG, "Failed to add restricted user to owner", e);
		}
		@@ -1290,11 +1263,6 @@ public class Vpn {
		}
		}

		/**
		* Updates UID ranges for this VPN and also updates its capabilities.
		*
		* <p>Should be called on primary ConnectivityService thread.
		*/
		public void onUserRemoved(int userHandle) {
		// clean up if restricted
		UserInfo user = UserManager.get(mContext).getUserInfo(userHandle);
		@@ -1306,9 +1274,8 @@ public class Vpn {
		final List<UidRange> removedRanges =
		uidRangesForUser(userHandle, existingRanges);
		existingRanges.removeAll(removedRanges);
		// ConnectivityService will call {@link #updateCapabilities} and
		// apply those for VPN network.
		mNetworkCapabilities.setUids(existingRanges);
		updateCapabilities();
		} catch (Exception e) {
		Log.wtf(TAG, "Failed to remove restricted user to owner", e);
		}
		@@ -1516,12 +1483,6 @@ public class Vpn {
		return success;
		}

		/**
		* Updates underlying network set.
		*
		* <p>Note: Does not updates capabilities. Call {@link #updateCapabilities} from
		* ConnectivityService thread to get updated capabilities.
		*/
		public synchronized boolean setUnderlyingNetworks(Network[] networks) {
		if (!isCallerEstablishedOwnerLocked()) {
		return false;
		@@ -1538,6 +1499,7 @@ public class Vpn {
		}
		}
		}
		updateCapabilities();
		return true;
		}

services/core/java/com/android/server/location/GnssLocationProvider.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -810,12 +810,11 @@ public class GnssLocationProvider implements LocationProviderInterface, InjectNt
		// while IO initialization and registration is delegated to our internal handler
		// this approach is just fine because events are posted to our handler anyway
		mProperties = new Properties();
		sendMessage(INITIALIZE_HANDLER, 0, null);

		// Create a GPS net-initiated handler.
		// Create a GPS net-initiated handler (also needed by handleInitialize)
		mNIHandler = new GpsNetInitiatedHandler(context,
		mNetInitiatedListener,
		mSuplEsEnabled);
		sendMessage(INITIALIZE_HANDLER, 0, null);

		mListenerHelper = new GnssStatusListenerHelper(mHandler) {
		@Override