Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / 46c0bc94074ba7a72f8146c0e964d7353ff15df4
commit46c0bc94074ba7a72f8146c0e964d7353ff15df4[log] [tgz]
authorBryan Ferris <bferris@google.com>Tue Jun 25 18:36:14 2019 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Tue Jun 25 18:36:14 2019 +0000
tree260d6bc49a5c8a5b26b798ec1cedc82f0ad999df
parent7af053390ad2f4423972efa160987bf87ff67c79 [diff]
parent51bb7163321e625815917421e69de6ed4c852995 [diff]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60
  [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
tree: 260d6bc49a5c8a5b26b798ec1cedc82f0ad999df
  1. apct-tests/
  2. api/
  3. cmds/
  4. core/
  5. data/
  6. docs/
  7. drm/
  8. graphics/
  9. keystore/
  10. legacy-test/
  11. libs/
  12. location/
  13. media/
  14. native/
  15. nfc-extras/
  16. obex/
  17. opengl/
  18. packages/
  19. proto/
  20. rs/
  21. samples/
  22. sax/
  23. services/
  24. telecomm/
  25. telephony/
  26. test-runner/
  27. tests/
  28. tools/
  29. vr/
  30. wifi/
  31. Android.bp
  32. Android.mk
  33. CleanSpec.mk
  34. compiled-classes-phone
  35. MODULE_LICENSE_APACHE2
  36. NOTICE
  37. pathmap.mk
  38. preloaded-classes
  39. PREUPLOAD.cfg