Snap for 4916303 from 5ad001eb4f5152cf8d534608ebd2d369e383e8b9 to pi-qpr1-release (5d8a3bba) · Commits · e / os / android_frameworks_base

core/java/android/net/TrafficStats.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -329,6 +329,14 @@ public class TrafficStats {

		/**
		* Remove any statistics parameters from the given {@link Socket}.
		* <p>
		* In Android 8.1 (API level 27) and lower, a socket is automatically
		* untagged when it's sent to another process using binder IPC with a
		* {@code ParcelFileDescriptor} container. In Android 9.0 (API level 28)
		* and higher, the socket tag is kept when the socket is sent to another
		* process using binder IPC. You can mimic the previous behavior by
		* calling {@code untagSocket()} before sending the socket to another
		* process.
		*/
		public static void untagSocket(Socket socket) throws SocketException {
		SocketTagger.get().untag(socket);

core/java/android/service/notification/Condition.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -151,12 +151,12 @@ public final class Condition implements Parcelable {
		@Override
		public String toString() {
		return new StringBuilder(Condition.class.getSimpleName()).append('[')
		.append("id=").append(id)
		.append("state=").append(stateToString(state))
		.append(",id=").append(id)
		.append(",summary=").append(summary)
		.append(",line1=").append(line1)
		.append(",line2=").append(line2)
		.append(",icon=").append(icon)
		.append(",state=").append(stateToString(state))
		.append(",flags=").append(flags)
		.append(']').toString();
		}

core/java/android/service/notification/ZenModeConfig.java

+29 −11

Original line number	Diff line number	Diff line
		@@ -240,11 +240,29 @@ public class ZenModeConfig implements Parcelable {
		.append(",allowMessagesFrom=").append(sourceToString(allowMessagesFrom))
		.append(",suppressedVisualEffects=").append(suppressedVisualEffects)
		.append(",areChannelsBypassingDnd=").append(areChannelsBypassingDnd)
		.append(",automaticRules=").append(automaticRules)
		.append(",manualRule=").append(manualRule)
		.append(",\nautomaticRules=").append(rulesToString())
		.append(",\nmanualRule=").append(manualRule)
		.append(']').toString();
		}

		private String rulesToString() {
		if (automaticRules.isEmpty()) {
		return "{}";
		}

		StringBuilder buffer = new StringBuilder(automaticRules.size() * 28);
		buffer.append('{');
		for (int i = 0; i < automaticRules.size(); i++) {
		if (i > 0) {
		buffer.append(",\n");
		}
		Object value = automaticRules.valueAt(i);
		buffer.append(value);
		}
		buffer.append('}');
		return buffer.toString();
		}

		private Diff diff(ZenModeConfig to) {
		final Diff d = new Diff();
		if (to == null) {
		@@ -1009,10 +1027,10 @@ public class ZenModeConfig implements Parcelable {

		public static ScheduleInfo tryParseScheduleConditionId(Uri conditionId) {
		final boolean isSchedule = conditionId != null
		&& conditionId.getScheme().equals(Condition.SCHEME)
		&& conditionId.getAuthority().equals(ZenModeConfig.SYSTEM_AUTHORITY)
		&& Condition.SCHEME.equals(conditionId.getScheme())
		&& ZenModeConfig.SYSTEM_AUTHORITY.equals(conditionId.getAuthority())
		&& conditionId.getPathSegments().size() == 1
		&& conditionId.getPathSegments().get(0).equals(ZenModeConfig.SCHEDULE_PATH);
		&& ZenModeConfig.SCHEDULE_PATH.equals(conditionId.getPathSegments().get(0));
		if (!isSchedule) return null;
		final int[] start = tryParseHourAndMinute(conditionId.getQueryParameter("start"));
		final int[] end = tryParseHourAndMinute(conditionId.getQueryParameter("end"));
		@@ -1110,10 +1128,10 @@ public class ZenModeConfig implements Parcelable {

		public static EventInfo tryParseEventConditionId(Uri conditionId) {
		final boolean isEvent = conditionId != null
		&& conditionId.getScheme().equals(Condition.SCHEME)
		&& conditionId.getAuthority().equals(ZenModeConfig.SYSTEM_AUTHORITY)
		&& Condition.SCHEME.equals(conditionId.getScheme())
		&& ZenModeConfig.SYSTEM_AUTHORITY.equals(conditionId.getAuthority())
		&& conditionId.getPathSegments().size() == 1
		&& conditionId.getPathSegments().get(0).equals(EVENT_PATH);
		&& EVENT_PATH.equals(conditionId.getPathSegments().get(0));
		if (!isEvent) return null;
		final EventInfo rt = new EventInfo();
		rt.userId = tryParseInt(conditionId.getQueryParameter("userId"), UserHandle.USER_NULL);
		@@ -1322,14 +1340,14 @@ public class ZenModeConfig implements Parcelable {
		@Override
		public String toString() {
		return new StringBuilder(ZenRule.class.getSimpleName()).append('[')
		.append("enabled=").append(enabled)
		.append("id=").append(id)
		.append(",enabled=").append(String.valueOf(enabled).toUpperCase())
		.append(",snoozing=").append(snoozing)
		.append(",name=").append(name)
		.append(",zenMode=").append(Global.zenModeToString(zenMode))
		.append(",conditionId=").append(conditionId)
		.append(",condition=").append(condition)
		.append(",component=").append(component)
		.append(",id=").append(id)
		.append(",creationTime=").append(creationTime)
		.append(",enabler=").append(enabler)
		.append(']').toString();
		@@ -1461,7 +1479,7 @@ public class ZenModeConfig implements Parcelable {
		final int N = lines.size();
		for (int i = 0; i < N; i++) {
		if (i > 0) {
		sb.append(',');
		sb.append(",\n");
		}
		sb.append(lines.get(i));
		}

core/java/com/android/internal/os/BatteryStatsImpl.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -4021,7 +4021,9 @@ public class BatteryStatsImpl extends BatteryStats {
		try {
		IBatteryPropertiesRegistrar registrar = IBatteryPropertiesRegistrar.Stub.asInterface(
		ServiceManager.getService("batteryproperties"));
		if (registrar != null) {
		registrar.scheduleUpdate();
		}
		} catch (RemoteException e) {
		// Ignore.
		}

core/java/com/android/server/BootReceiver.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -258,13 +258,13 @@ public class BootReceiver extends BroadcastReceiver {

		// Start watching for new tombstone files; will record them as they occur.
		// This gets registered with the singleton file observer thread.
		sTombstoneObserver = new FileObserver(TOMBSTONE_DIR.getPath(), FileObserver.CLOSE_WRITE) {
		sTombstoneObserver = new FileObserver(TOMBSTONE_DIR.getPath(), FileObserver.CREATE) {
		@Override
		public void onEvent(int event, String path) {
		HashMap<String, Long> timestamps = readTimestamps();
		try {
		File file = new File(TOMBSTONE_DIR, path);
		if (file.isFile()) {
		if (file.isFile() && file.getName().startsWith("tombstone_")) {
		addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,
		TAG_TOMBSTONE);
		}