Snap for 4801384 from b82d3d7e741ff8fe6bf7d1cae79d519fe4922d9a to pi-release (89f68040) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -939,7 +939,8 @@ public final class ActivityThread extends ClientTransactionHandler {
		}

		public void setHttpProxy(String host, String port, String exclList, Uri pacFileUrl) {
		final ConnectivityManager cm = ConnectivityManager.from(getSystemContext());
		final ConnectivityManager cm = ConnectivityManager.from(
		getApplication() != null ? getApplication() : getSystemContext());
		final Network network = cm.getBoundNetworkForProcess();
		if (network != null) {
		Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());

core/java/android/app/usage/IUsageStatsManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ interface IUsageStatsManager {
		String callingPackage);
		UsageEvents queryEvents(long beginTime, long endTime, String callingPackage);
		UsageEvents queryEventsForPackage(long beginTime, long endTime, String callingPackage);
		UsageEvents queryEventsForUser(long beginTime, long endTime, int userId, String callingPackage);
		UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage);
		void setAppInactive(String packageName, boolean inactive, int userId);
		boolean isAppInactive(String packageName, int userId);
		void whitelistAppTemporarily(String packageName, long duration, int userId);

core/java/android/app/usage/UsageEvents.java

+23 −15

Original line number	Diff line number	Diff line
		@@ -399,16 +399,20 @@ public final class UsageEvents implements Parcelable {
		* {@hide}
		*/
		public UsageEvents(Parcel in) {
		mEventCount = in.readInt();
		mIndex = in.readInt();
		byte[] bytes = in.readBlob();
		Parcel data = Parcel.obtain();
		data.unmarshall(bytes, 0, bytes.length);
		data.setDataPosition(0);
		mEventCount = data.readInt();
		mIndex = data.readInt();
		if (mEventCount > 0) {
		mStringPool = in.createStringArray();
		mStringPool = data.createStringArray();

		final int listByteLength = in.readInt();
		final int positionInParcel = in.readInt();
		final int listByteLength = data.readInt();
		final int positionInParcel = data.readInt();
		mParcel = Parcel.obtain();
		mParcel.setDataPosition(0);
		mParcel.appendFrom(in, in.dataPosition(), listByteLength);
		mParcel.appendFrom(data, data.dataPosition(), listByteLength);
		mParcel.setDataSize(mParcel.dataPosition());
		mParcel.setDataPosition(positionInParcel);
		}
		@@ -586,10 +590,11 @@ public final class UsageEvents implements Parcelable {

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mEventCount);
		dest.writeInt(mIndex);
		Parcel data = Parcel.obtain();
		data.writeInt(mEventCount);
		data.writeInt(mIndex);
		if (mEventCount > 0) {
		dest.writeStringArray(mStringPool);
		data.writeStringArray(mStringPool);

		if (mEventsToWrite != null) {
		// Write out the events
		@@ -604,31 +609,34 @@ public final class UsageEvents implements Parcelable {
		final int listByteLength = p.dataPosition();

		// Write the total length of the data.
		dest.writeInt(listByteLength);
		data.writeInt(listByteLength);

		// Write our current position into the data.
		dest.writeInt(0);
		data.writeInt(0);

		// Write the data.
		dest.appendFrom(p, 0, listByteLength);
		data.appendFrom(p, 0, listByteLength);
		} finally {
		p.recycle();
		}

		} else if (mParcel != null) {
		// Write the total length of the data.
		dest.writeInt(mParcel.dataSize());
		data.writeInt(mParcel.dataSize());

		// Write out current position into the data.
		dest.writeInt(mParcel.dataPosition());
		data.writeInt(mParcel.dataPosition());

		// Write the data.
		dest.appendFrom(mParcel, 0, mParcel.dataSize());
		data.appendFrom(mParcel, 0, mParcel.dataSize());
		} else {
		throw new IllegalStateException(
		"Either mParcel or mEventsToWrite must not be null");
		}
		}
		// Data can be too large for a transact. Write the data as a Blob, which will be written to
		// ashmem if too large.
		dest.writeBlob(data.marshall());
		}

		public static final Creator<UsageEvents> CREATOR = new Creator<UsageEvents>() {

core/java/android/hardware/camera2/CameraCharacteristics.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,15 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		mKey = new CameraMetadataNative.Key<T>(name, type, vendorId);
		}

		/**
		* Visible for testing and vendor extensions only.
		*
		* @hide
		*/
		public Key(String name, String fallbackName, Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type);
		}

		/**
		* Visible for testing and vendor extensions only.
		*

core/java/android/hardware/camera2/CaptureResult.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,15 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		mKey = new CameraMetadataNative.Key<T>(name, type, vendorId);
		}

		/**
		* Visible for testing and vendor extensions only.
		*
		* @hide
		*/
		public Key(String name, String fallbackName, Class<T> type) {
		mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type);
		}

		/**
		* Visible for testing and vendor extensions only.
		*