1bc24d187715db74a40c7dabbb83507321ac53aa - platform/frameworks/base

commit	1bc24d187715db74a40c7dabbb83507321ac53aa	[log] [tgz]
author	Bryan Ferris <bferris@google.com>	Wed Jun 26 00:49:56 2019 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Jun 26 00:49:56 2019 +0000
tree	2e06c06f0c635c5267d8d1a6d60e06547829cf3c
parent	13a804ee271845b2ab95183a5c0d0c5a02bdefa2 [diff]
parent	b16bfc06a0c183e5b2913e2e590c920d743754eb [diff]

Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev

* changes:
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118 skipped: 14b074ddfe
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95 skipped: a284320118
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a
  [automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c
  [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage

tree: 2e06c06f0c635c5267d8d1a6d60e06547829cf3c