Merge "Idle whitelist always-on VPN host apps while VPN services are launching" (5c9057f8) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -1252,11 +1252,20 @@ public class DeviceIdleController extends SystemService
		}

		public class LocalService {
		// duration in milliseconds
		public void addPowerSaveTempWhitelistApp(int callingUid, String packageName,
		long duration, int userId, boolean sync, String reason) {
		addPowerSaveTempWhitelistAppInternal(callingUid, packageName, duration,
		userId, sync, reason);
		}

		// duration in milliseconds
		public void addPowerSaveTempWhitelistAppDirect(int appId, long duration, boolean sync,
		String reason) {
		addPowerSaveTempWhitelistAppDirectInternal(0, appId, duration, sync, reason);
		}

		// duration in milliseconds
		public long getNotificationWhitelistDuration() {
		return mConstants.NOTIFICATION_WHITELIST_DURATION;
		}

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

+25 −7

Original line number	Diff line number	Diff line
		@@ -85,6 +85,8 @@ import com.android.internal.net.LegacyVpnInfo;
		import com.android.internal.net.VpnConfig;
		import com.android.internal.net.VpnInfo;
		import com.android.internal.net.VpnProfile;
		import com.android.server.DeviceIdleController;
		import com.android.server.LocalServices;
		import com.android.server.net.BaseNetworkObserver;

		import libcore.io.IoUtils;
		@@ -115,6 +117,10 @@ public class Vpn {
		private static final String TAG = "Vpn";
		private static final boolean LOGD = true;

		// Length of time (in milliseconds) that an app hosting an always-on VPN is placed on
		// the device idle whitelist during service launch and VPN bootstrap.
		private static final long VPN_LAUNCH_IDLE_WHITELIST_DURATION = 60 * 1000;

		// TODO: create separate trackers for each unique VPN to support
		// automated reconnection

		@@ -389,6 +395,15 @@ public class Vpn {
		}
		}

		// Tell the OS that background services in this app need to be allowed for
		// a short time, so we can bootstrap the VPN service.
		final long oldId = Binder.clearCallingIdentity();
		try {
		DeviceIdleController.LocalService idleController =
		LocalServices.getService(DeviceIdleController.LocalService.class);
		idleController.addPowerSaveTempWhitelistApp(Process.myUid(), alwaysOnPackage,
		VPN_LAUNCH_IDLE_WHITELIST_DURATION, mUserHandle, false, "vpn");

		// Start the VPN service declared in the app's manifest.
		Intent serviceIntent = new Intent(VpnConfig.SERVICE_INTERFACE);
		serviceIntent.setPackage(alwaysOnPackage);
		@@ -398,6 +413,9 @@ public class Vpn {
		Log.e(TAG, "VpnService " + serviceIntent + " failed to start", e);
		return false;
		}
		} finally {
		Binder.restoreCallingIdentity(oldId);
		}
		}

		/**