Merge remote-tracking branch 'origin/lineage-19.1' into v1-s (5aaa83cb) · Commits · e / os / android_frameworks_base

core/java/android/app/AutomaticZenRule.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ public final class AutomaticZenRule implements Parcelable {
		name = getTrimmedString(source.readString());
		}
		interruptionFilter = source.readInt();
		conditionId = source.readParcelable(null);
		conditionId = getTrimmedUri(source.readParcelable(null));
		owner = getTrimmedComponentName(source.readParcelable(null));
		configurationActivity = getTrimmedComponentName(source.readParcelable(null));
		creationTime = source.readLong();

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,8 @@ interface ILauncherApps {
		void startActivityAsUser(in IApplicationThread caller, String callingPackage,
		String callingFeatureId, in ComponentName component, in Rect sourceBounds,
		in Bundle opts, in UserHandle user);
		PendingIntent getActivityLaunchIntent(in ComponentName component, in Bundle opts,
		in UserHandle user);
		PendingIntent getActivityLaunchIntent(String callingPackage, in ComponentName component,
		in Bundle opts, in UserHandle user);
		void showAppDetailsAsUser(in IApplicationThread caller, String callingPackage,
		String callingFeatureId, in ComponentName component, in Rect sourceBounds,
		in Bundle opts, in UserHandle user);

+2 −1

Original line number	Diff line number	Diff line
		@@ -752,7 +752,8 @@ public class LauncherApps {
		}
		try {
		// due to b/209607104, startActivityOptions will be ignored
		return mService.getActivityLaunchIntent(component, null /* opts */, user);
		return mService.getActivityLaunchIntent(mContext.getPackageName(), component,
		null /* opts */, user);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1695,6 +1695,9 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {
		for (int i = component.getIntents().size() - 1; i >= 0; i--) {
		IntentFilter filter = component.getIntents().get(i);
		for (int groupIndex = filter.countMimeGroups() - 1; groupIndex >= 0; groupIndex--) {
		if (mimeGroups != null && mimeGroups.size() > 500) {
		throw new IllegalStateException("Max limit on number of MIME Groups reached");
		}
		mimeGroups = ArrayUtils.add(mimeGroups, filter.getMimeGroup(groupIndex));
		}
		}

+28 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,34 @@ public class UsbDeviceConnection {
		}
		}

		/**
		* This is meant to be called by UsbRequest's queue() in order to synchronize on
		* UsbDeviceConnection's mLock to prevent the connection being closed while queueing.
		*/
		/* package */ boolean queueRequest(UsbRequest request, ByteBuffer buffer, int length) {
		synchronized (mLock) {
		if (!isOpen()) {
		return false;
		}

		return request.queueIfConnectionOpen(buffer, length);
		}
		}

		/**
		* This is meant to be called by UsbRequest's queue() in order to synchronize on
		* UsbDeviceConnection's mLock to prevent the connection being closed while queueing.
		*/
		/* package */ boolean queueRequest(UsbRequest request, @Nullable ByteBuffer buffer) {
		synchronized (mLock) {
		if (!isOpen()) {
		return false;
		}

		return request.queueIfConnectionOpen(buffer);
		}
		}

		/**
		* Releases all system resources related to the device.
		* Once the object is closed it cannot be used again.