Unverified Commit 9b500577 authored Aug 12, 2019 by Kevin F. Haggerty

Merge remote-tracking branch 'aosp/oreo-mr1-security-release' into lineage-15.1

* aosp/oreo-mr1-security-release: (68 commits)
  Clear the Parcel before writing an exception during a transaction
  Protect VPN dialogs against overlay.
  [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).
  HwBlob: s/malloc/calloc/
  SUPL ES Extension - June 2019 rollup
  [RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
  Limit IsSeparateProfileChallengeAllowed to system callers
  Added missing permission check to isPackageDeviceAdminOnAnyUser.
  Permission Check For DPM.getPermittedAccessibilityServices
  DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot
  Revert "Adding SUPL NI Emergency Extension Time"
  DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e
  RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
  Adding SUPL NI Emergency Extension Time
  FRP: save password quality in DPM.resetPassword
  [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control
  Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
  Revert "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control"
  RESTRICT AUTOMERGE: Recover shady content:// paths.
  [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control
  ...

Change-Id: Id108dc782e17da0d76595e162a3fcb72a108a684

parents 7660e09c d45487d0

core/java/android/os/Binder.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -706,6 +706,8 @@ public class Binder implements IBinder {
		Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);
		}
		} else {
		// Clear the parcel before writing the exception
		reply.setDataSize(0);
		reply.setDataPosition(0);
		reply.writeException(e);
		}