Gitiles
Code Review Sign In
android-review.linaro.org / platform / packages / apps / KeyChain / refs/heads/android-s-beta-4
  1. 3c24d9f Merge "Import translations. DO NOT MERGE ANYWHERE" by Treehugger Robot · 3 years ago android-s-beta-4 android-s-beta-5 android-s-beta-3 android-s-beta-4 android-s-beta-5
  2. bec012c Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  3. d4dfc43 Merge "DO NOT MERGE - Merge RQ3A.210605.005" by Xin Li · 3 years ago
  4. 3dc2ea0 DO NOT MERGE - Merge RQ3A.210605.005 by Xin Li · 3 years ago
  5. b4988c8 DO NOT MERGE - Mark RQ3A.210410.001 as merged by Xin Li · 3 years ago tmp_sam_RQ3A.210605.005
  6. 9d9b96e Merge "DO NOT MERGE - Merge ab/7272582" am: 8a7ed9e553 by Xin Li · 3 years ago
  7. 8cdbd51 DO NOT MERGE - Merge ab/7272582 am: f8b8823018 by Xin Li · 3 years ago
  8. 8a7ed9e Merge "DO NOT MERGE - Merge ab/7272582" by Xin Li · 3 years ago
  9. f8b8823 DO NOT MERGE - Merge ab/7272582 by Xin Li · 3 years ago
  10. a786669 Merge "Add Alex, move myself to emeritus owners section" am: 1a757c73f3 by Treehugger Robot · 3 years, 1 month ago
  11. 1a757c7 Merge "Add Alex, move myself to emeritus owners section" by Treehugger Robot · 3 years, 1 month ago android-s-beta-1 android-s-beta-2
  12. a14a9d2 Add Alex, move myself to emeritus owners section by Eran Messeri · 3 years, 1 month ago
  13. 7fc6161 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8e54345a1f -s ours by Treehugger Robot · 3 years, 2 months ago
  14. 8e54345 Merge "Import translations. DO NOT MERGE ANYWHERE" by Treehugger Robot · 3 years, 2 months ago
  15. 6580b76 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years, 2 months ago
  16. 5a55972 Snap for 7239954 from f587814d825c341be346cbf4165c23d854d091bd to rvc-qpr3-release by android-build-team Robot · 3 years, 3 months ago android11-qpr3-release android11-qpr3-s1-release android-11.0.0_r38 android-11.0.0_r39 android-11.0.0_r40 android-11.0.0_r43 android-11.0.0_r46
  17. 7a0c863 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f587814d82 -s ours by Bill Yi · 3 years, 3 months ago temp_ab_7272582
  18. f587814 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years, 3 months ago
  19. d905d20 Merge "Fix typo in KeyChainService." am: 0cc20d00ed am: 174487c434 by Janis Danisevskis · 3 years, 3 months ago
  20. 174487c Merge "Fix typo in KeyChainService." am: 0cc20d00ed by Janis Danisevskis · 3 years, 3 months ago
  21. 0cc20d0 Merge "Fix typo in KeyChainService." by Janis Danisevskis · 3 years, 3 months ago
  22. 93cbf15 Merge "Keystore 2.0: Remove all references to Keystore 1.0" am: cbf105a553 am: bb1e25c988 by Treehugger Robot · 3 years, 3 months ago
  23. bb1e25c Merge "Keystore 2.0: Remove all references to Keystore 1.0" am: cbf105a553 by Treehugger Robot · 3 years, 3 months ago
  24. cbf105a Merge "Keystore 2.0: Remove all references to Keystore 1.0" by Treehugger Robot · 3 years, 3 months ago
  25. 80d42e6 Fix typo in KeyChainService. by Janis Danisevskis · 3 years, 3 months ago
  26. 1d185ca Keystore 2.0: Remove all references to Keystore 1.0 by Janis Danisevskis · 3 years, 3 months ago
  27. b2cc855 [automerger skipped] Merge "Merge RQ2A.210305.007" am: ef108ea1e1 -s ours am: 58b87ff37c -s ours by Xin Li · 3 years, 3 months ago
  28. 58b87ff [automerger skipped] Merge "Merge RQ2A.210305.007" am: ef108ea1e1 -s ours by Xin Li · 3 years, 3 months ago
  29. ef108ea Merge "Merge RQ2A.210305.007" by Xin Li · 3 years, 3 months ago
  30. af9b7f5 Merge RQ2A.210305.007 by Xin Li · 3 years, 3 months ago
  31. 62bfbef Merge "KeyChain/Keystore 2.0" am: 4d9cd24e64 am: f7ebfa4535 by Treehugger Robot · 3 years, 4 months ago
  32. f7ebfa4 Merge "KeyChain/Keystore 2.0" am: 4d9cd24e64 by Treehugger Robot · 3 years, 4 months ago temp_RQ2A.210305.007
  33. 4d9cd24 Merge "KeyChain/Keystore 2.0" by Treehugger Robot · 3 years, 4 months ago
  34. 069a823 KeyChain/Keystore 2.0 by Janis Danisevskis · 3 years, 5 months ago
  35. 4e56bde [automerger skipped] Merge ab/7061308 into stage. am: a02620169c -s ours by Xin Li · 3 years, 4 months ago
  36. a026201 Merge ab/7061308 into stage. by Xin Li · 3 years, 4 months ago
  37. 04ac45b Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/KeyChain" am: 24640a1c84 am: d9a0b573a3 by Bob Badour · 3 years, 4 months ago
  38. d9a0b57 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/KeyChain" am: 24640a1c84 by Bob Badour · 3 years, 4 months ago
  39. 24640a1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/KeyChain" by Bob Badour · 3 years, 4 months ago
  40. 07ac5f3 Merge "Handle null case KeyChain getPredefinedAliasForPackageAndUri" am: acb5deee41 am: 3b3d5dc184 by Treehugger Robot · 3 years, 4 months ago
  41. 3b3d5dc Merge "Handle null case KeyChain getPredefinedAliasForPackageAndUri" am: acb5deee41 by Treehugger Robot · 3 years, 4 months ago
  42. acb5dee Merge "Handle null case KeyChain getPredefinedAliasForPackageAndUri" by Treehugger Robot · 3 years, 4 months ago android-s-preview-1
  43. 02b2a11 Merge "Update KeyChainService caller checks" am: 79b8834964 am: e4da0c010a by Rubin Xu · 3 years, 4 months ago
  44. e4da0c0 Merge "Update KeyChainService caller checks" am: 79b8834964 by Rubin Xu · 3 years, 4 months ago
  45. 79b8834 Merge "Update KeyChainService caller checks" by Rubin Xu · 3 years, 4 months ago
  46. dee18ac [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/KeyChain by Bob Badour · 3 years, 4 months ago
  47. d047860 Merge "Add cred mng app metrics to KeyChain" am: dfb9e12b6d am: fd69599721 by Rubin Xu · 3 years, 4 months ago
  48. fd69599 Merge "Add cred mng app metrics to KeyChain" am: dfb9e12b6d by Rubin Xu · 3 years, 4 months ago
  49. dfb9e12 Merge "Add cred mng app metrics to KeyChain" by Rubin Xu · 3 years, 4 months ago
  50. 3685a67 Merge "Centralise logic for setting credential manager app" am: 679f3ffd53 am: 78e8959350 by Treehugger Robot · 3 years, 4 months ago
  51. 78e8959 Merge "Centralise logic for setting credential manager app" am: 679f3ffd53 by Treehugger Robot · 3 years, 4 months ago
  52. 679f3ff Merge "Centralise logic for setting credential manager app" by Treehugger Robot · 3 years, 4 months ago
  53. b3f4726 Merge "Add DPM.getKeyPairGrants()" am: 3de79b4663 am: 1f3bc50d1a by Rubin Xu · 3 years, 4 months ago
  54. 1f3bc50 Merge "Add DPM.getKeyPairGrants()" am: 3de79b4663 by Rubin Xu · 3 years, 4 months ago
  55. 3de79b4 Merge "Add DPM.getKeyPairGrants()" by Rubin Xu · 3 years, 4 months ago
  56. ba21716 Merge "Add KeyChain implementation credential management app" am: f0fcc57b93 am: b793689047 by Rubin Xu · 3 years, 4 months ago
  57. b793689 Merge "Add KeyChain implementation credential management app" am: f0fcc57b93 by Rubin Xu · 3 years, 4 months ago
  58. f0fcc57 Merge "Add KeyChain implementation credential management app" by Rubin Xu · 3 years, 4 months ago
  59. 457dc0a Merge changes from topic "dpm_haskeypair" am: ae55bc73eb am: 15272fbfd4 by Rubin Xu · 3 years, 4 months ago
  60. fbf8078 Revert "Add check for misprovisioned Pixel 2 device." am: 7a4bacbb0b am: 86a00f126d by Eran Messeri · 3 years, 4 months ago
  61. 15272fb Merge changes from topic "dpm_haskeypair" am: ae55bc73eb by Rubin Xu · 3 years, 4 months ago
  62. 86a00f1 Revert "Add check for misprovisioned Pixel 2 device." am: 7a4bacbb0b by Eran Messeri · 3 years, 4 months ago
  63. ae55bc7 Merge changes from topic "dpm_haskeypair" by Rubin Xu · 3 years, 4 months ago
  64. 229a654 Handle null case KeyChain getPredefinedAliasForPackageAndUri by Alex Johnston · 3 years, 5 months ago
  65. 37adefd Update KeyChainService caller checks by Alex Johnston · 3 years, 5 months ago
  66. 8efd58b Add cred mng app metrics to KeyChain by Alex Johnston · 3 years, 5 months ago
  67. c772986 Centralise logic for setting credential manager app by Rubin Xu · 3 years, 6 months ago
  68. ad21f42 Add DPM.getKeyPairGrants() by Pavel Grafov · 3 years, 7 months ago
  69. 74152c1 Add KeyChain implementation credential management app by Alex Johnston · 3 years, 7 months ago
  70. 608d97e Add DPM.hasKeyPair() by Pavel Grafov · 3 years, 7 months ago
  71. 7a4bacb Revert "Add check for misprovisioned Pixel 2 device." by Eran Messeri · 4 years, 1 month ago
  72. b79ed6e Merge "KeyChain: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed by updatable ART module." am: f4fb66a22c am: 09b06b1013 by Daulet Zhanguzin · 3 years, 5 months ago
  73. 09b06b1 Merge "KeyChain: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed by updatable ART module." am: f4fb66a22c by Daulet Zhanguzin · 3 years, 5 months ago
  74. f4fb66a Merge "KeyChain: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed by updatable ART module." by Daulet Zhanguzin · 3 years, 5 months ago
  75. d23eb76 KeyChain: use unbundled version of BouncyCastle. BouncyCastle APIs cannot be exposed by updatable ART module. by Daulet Zhanguzin · 3 years, 5 months ago
  76. 573b552 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: d3680f5a0e -s ours am: 84befb93ee -s ours by Xin Li · 3 years, 6 months ago
  77. 84befb9 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: d3680f5a0e -s ours by Xin Li · 3 years, 6 months ago
  78. d3680f5 Merge "DO NOT MERGE - Merge Android R QPR1" by Xin Li · 3 years, 6 months ago
  79. abf8d22 DO NOT MERGE - Merge Android R QPR1 by Xin Li · 3 years, 6 months ago
  80. b2ba55c DO NOT MERGE - Merge RQ1A.201205.011 am: 02bfbd4a1c by Xin Li · 3 years, 6 months ago
  81. 02bfbd4 DO NOT MERGE - Merge RQ1A.201205.011 by Xin Li · 3 years, 6 months ago temp_rvc_qpr_merge
  82. 660e18c DO NOT MERGE - Mark RQ1A.201004.001 as merged am: e4a1ebe6e6 by Xin Li · 3 years, 6 months ago
  83. e4a1ebe DO NOT MERGE - Mark RQ1A.201004.001 as merged by Xin Li · 3 years, 6 months ago
  84. 9252f3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56f0958897 -s ours by Bill Yi · 3 years, 6 months ago
  85. 56f0958 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years, 6 months ago
  86. d697942 [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 43b4e4c1fa -s ours by Xin Li · 3 years, 6 months ago
  87. 43b4e4c Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 by Xin Li · 3 years, 7 months ago
  88. 56cf70b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f5ed988 -s ours am: 7225c2b55d -s ours am: 26a66de242 -s ours by Bill Yi · 3 years, 8 months ago
  89. ddd6b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f5ed988 -s ours am: 7225c2b55d -s ours am: 73fcf0fd57 -s ours by Bill Yi · 3 years, 8 months ago
  90. 26a66de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f5ed988 -s ours am: 7225c2b55d -s ours by Bill Yi · 3 years, 8 months ago
  91. 73fcf0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f5ed988 -s ours am: 7225c2b55d -s ours by Bill Yi · 3 years, 8 months ago
  92. 7225c2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b9f5ed988 -s ours by Bill Yi · 3 years, 8 months ago
  93. 9b9f5ed Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years, 8 months ago
  94. 2680c55 [automerger skipped] Merge "Merge redfin/bramble support." am: 222f1241dc -s ours am: 2303ce7a44 -s ours am: 1999e6fc8a -s ours by Treehugger Robot · 3 years, 8 months ago
  95. 1999e6f [automerger skipped] Merge "Merge redfin/bramble support." am: 222f1241dc -s ours am: 2303ce7a44 -s ours by Treehugger Robot · 3 years, 8 months ago
  96. 2303ce7 [automerger skipped] Merge "Merge redfin/bramble support." am: 222f1241dc -s ours by Treehugger Robot · 3 years, 8 months ago
  97. 222f124 Merge "Merge redfin/bramble support." by Treehugger Robot · 3 years, 8 months ago
  98. e7aa467 Merge redfin/bramble support. by Xin Li · 3 years, 8 months ago
  99. 6a7b186 Merge cherrypicks of [12820899, 12820921, 12820267, 12820924, 12820699, 12820781, 12821235, 12821236, 12820925, 12821237, 12820545, 12821039, 12820926, 12820927, 12820928, 12820929, 12820930, 12820590, 12820471, 12820591, 12820592, 12820593, 12820594, 12821255, 12821256, 12821257, 12820998, 12820932, 12821258, 12820546, 12820933, 12820934, 12820547, 12820548, 12821275, 12821238, 12821239, 12821240, 12821241, 12821199, 12821276, 12821277, 12821278, 12821279, 12821280] into rvc-qpr1-release by android-build-team Robot · 3 years, 8 months ago android11-qpr1-release android11-qpr1-s1-release android11-qpr1-s2-release android-11.0.0_r18 android-11.0.0_r19 android-11.0.0_r20 android-11.0.0_r21 android-11.0.0_r22 android-11.0.0_r23 android-11.0.0_r26 android-11.0.0_r27 android-11.0.0_r29
  100. ed1888e Install CA certificates into KeyStore by Eran Messeri · 3 years, 9 months ago