Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / da47e16505c9d2ab2862882e1112b40c3d5ca8c3
commitda47e16505c9d2ab2862882e1112b40c3d5ca8c3[log] [tgz]
authorPeter Wang <tpwang@google.com>Fri Jul 31 10:47:42 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Jul 31 10:47:42 2020 +0000
tree2c8d02402d429d1d9ab938a2094c24253c805f01
parent29ad9c8a1c3df0baae4e95d029377afa87ee843a [diff]
parentf5776165048b89af50d60c8845b91745a005dcbc [diff]
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours am: 68aed47728 -s ours am: c5a1961f76 -s ours am: f577616504 -s ours

am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 9487c9e513 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: Ifc57a2934b10301dc50e448cf6603a211500acf9
tree: 2c8d02402d429d1d9ab938a2094c24253c805f01
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. cmds/
  6. config/
  7. core/
  8. data/
  9. docs/
  10. drm/
  11. errorprone/
  12. graphics/
  13. identity/
  14. keystore/
  15. libs/
  16. location/
  17. lowpan/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc-extras/
  23. non-updatable-api/
  24. obex/
  25. opengl/
  26. packages/
  27. proto/
  28. rs/
  29. samples/
  30. sax/
  31. services/
  32. startop/
  33. telecomm/
  34. telephony/
  35. test-base/
  36. test-legacy/
  37. test-mock/
  38. test-runner/
  39. tests/
  40. tools/
  41. wifi/
  42. .clang-format
  43. .gitignore
  44. .mailmap
  45. Android.bp
  46. Android.mk
  47. ApiDocs.bp
  48. CleanSpec.mk
  49. framework-jarjar-rules.txt
  50. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. pathmap.mk
  54. PREUPLOAD.cfg
  55. StubLibraries.bp
  56. TEST_MAPPING