Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android / packages / apps / Settings / 62694fefcb0767b80a607cef952de3c4d6f5eb64
  1. 62694fe [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours by Bonian Chen · 2 years, 9 months ago
  2. ad3fef8 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours by Bonian Chen · 2 years, 9 months ago
  3. 8c89ac9 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours by Bonian Chen · 2 years, 9 months ago
  4. 961d4b2 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours by Bonian Chen · 2 years, 9 months ago
  5. c058392 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours by Bonian Chen · 2 years, 9 months ago
  6. b17f587 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours by Bonian Chen · 2 years, 9 months ago
  7. eedfefa [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours by Bonian Chen · 2 years, 9 months ago
  8. 83e4693 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours by Bonian Chen · 2 years, 9 months ago
  9. 771b606 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours by Bonian Chen · 2 years, 9 months ago
  10. 351e22f [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours by Bonian Chen · 2 years, 9 months ago
  11. d35d3e2 Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 by Bonian Chen · 2 years, 9 months ago
  12. 35c5b0b [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours by Bonian Chen · 2 years, 9 months ago
  13. fcdc4a4 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours by Bonian Chen · 2 years, 9 months ago
  14. d15869f [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours by Bonian Chen · 2 years, 9 months ago
  15. 96fe347 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours by Bonian Chen · 2 years, 9 months ago
  16. e8097d4 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours by Bonian Chen · 2 years, 9 months ago
  17. eefa737 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours by Bonian Chen · 2 years, 9 months ago
  18. a84027d Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev by Bonian Chen · 2 years, 9 months ago
  19. 0f10561 Merge "[Settings] Move display of VPN version into summary text" into sc-dev by Bonian Chen · 2 years, 9 months ago
  20. 6279d80 Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev by Bonian Chen · 2 years, 9 months ago
  21. d0d67e6 Merge "[Settings] Move display of VPN version into summary text" into rvc-dev by Bonian Chen · 2 years, 9 months ago
  22. d088897 Merge "[Settings] Move display of VPN version into summary text" into qt-dev by Bonian Chen · 2 years, 9 months ago
  23. 8eacc8a [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours by TreeHugger Robot · 2 years, 9 months ago
  24. 7bd2371 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours by TreeHugger Robot · 2 years, 9 months ago
  25. 0b507f0 [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd by TreeHugger Robot · 2 years, 9 months ago
  26. ed29b05 [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 by TreeHugger Robot · 2 years, 9 months ago
  27. e6e739d Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 by TreeHugger Robot · 2 years, 9 months ago
  28. 74ff164 Merge "Prevent exfiltration of system files via user image settings." into qt-dev by TreeHugger Robot · 2 years, 9 months ago
  29. a30d123 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 by Weng Su · 2 years, 9 months ago
  30. 4c4a1f5 Restrict secondary users to share Wi-Fi network by Weng Su · 2 years, 9 months ago
  31. 734d949 [automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours by TreeHugger Robot · 2 years, 10 months ago
  32. f48ae98 Merge "Change default USB configuration to a RestrictedPreference" into sc-dev by TreeHugger Robot · 2 years, 10 months ago
  33. 7b40a55 Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev by TreeHugger Robot · 2 years, 10 months ago
  34. 92245b8 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 by lucaslin · 2 years, 10 months ago
  35. b38110f Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 by lucaslin · 2 years, 10 months ago
  36. 652527b Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 by lucaslin · 2 years, 10 months ago
  37. 14e88ca Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 by lucaslin · 2 years, 10 months ago
  38. 2c1c76c Hide private DNS settings UI in Guest mode am: 52e863b5a2 by lucaslin · 2 years, 10 months ago
  39. 52e863b Hide private DNS settings UI in Guest mode by lucaslin · 2 years, 10 months ago
  40. 15d0cfe [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb by Presubmit Automerger Backend · 2 years, 10 months ago
  41. bc4fd99 Change default USB configuration to a RestrictedPreference by Alex Johnston · 2 years, 10 months ago
  42. 8950a90 Prevent exfiltration of system files via user image settings. by Oli Lan · 2 years, 10 months ago
  43. 40e2384 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours by Bill Yi · 2 years, 10 months ago
  44. a9e8ee6 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  45. 2ba7f57 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  46. a18ff15 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev by TreeHugger Robot · 2 years, 10 months ago
  47. fc83e2a Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  48. 3913e56 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 by Bill Yi · 2 years, 10 months ago
  49. b07f4ec Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  50. 1c5ae8a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev by TreeHugger Robot · 2 years, 10 months ago
  51. b3c8156 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  52. 382229b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c by Bill Yi · 2 years, 10 months ago
  53. bfb1c00 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 10 months ago
  54. b3762ca [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours by Jack Yu · 2 years, 11 months ago
  55. 5163fd7 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours by Jack Yu · 2 years, 11 months ago
  56. 7093dea [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours by Jack Yu · 2 years, 11 months ago
  57. cd6ce52 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours by Jack Yu · 2 years, 11 months ago
  58. 46bd9ba Do not let guest user disable secure nfc am: 4e543a38f6 by Jack Yu · 2 years, 11 months ago
  59. e7f361b Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 2 years, 11 months ago
  60. 4e543a3 Do not let guest user disable secure nfc by Jack Yu · 3 years ago
  61. 05dfb08 Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d by Jack Yu · 2 years, 11 months ago
  62. b854167 Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 by Jack Yu · 2 years, 11 months ago
  63. 1009054 Do not let guest user disable secure nfc am: a579ca7554 by Jack Yu · 2 years, 11 months ago
  64. 7793bd6 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev by Bill Yi · 2 years, 11 months ago
  65. 4dab10d Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  66. 86cab2c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 by Bill Yi · 3 years ago
  67. e4ca28a Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  68. a579ca7 Do not let guest user disable secure nfc by Jack Yu · 3 years ago
  69. e7e23fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours by TreeHugger Robot · 3 years ago
  70. bbf2713 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours by Bill Yi · 3 years ago
  71. 572b59c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev by TreeHugger Robot · 3 years ago
  72. 87e5157 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev by TreeHugger Robot · 3 years ago
  73. 0eab9c0 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  74. a6f38c1 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  75. 9d56130 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  76. 3bf676d Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 3 years ago
  77. fc22f7f [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours by TreeHugger Robot · 3 years ago
  78. 8a91ea7 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours by TreeHugger Robot · 3 years ago
  79. 0abbff1 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours by TreeHugger Robot · 3 years ago
  80. 616aecf [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours by TreeHugger Robot · 3 years ago
  81. 97729a9 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours by TreeHugger Robot · 3 years ago
  82. 02a19ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours by TreeHugger Robot · 3 years ago
  83. 3f6a48a Merge "Add caller check to com.android.credentials.RESET" into rvc-dev by TreeHugger Robot · 3 years ago
  84. 9f4837e [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours by TreeHugger Robot · 3 years ago
  85. b04e0ab Merge "Add caller check to com.android.credentials.RESET" into sc-dev by TreeHugger Robot · 3 years ago
  86. 3e06e0c [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours by TreeHugger Robot · 3 years ago
  87. 3a4ebbf Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 by TreeHugger Robot · 3 years ago
  88. 01739e1 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours by TreeHugger Robot · 3 years ago
  89. ea3d036 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 by TreeHugger Robot · 3 years ago
  90. 67f53e2 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 by TreeHugger Robot · 3 years ago
  91. d902f8c Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 by TreeHugger Robot · 3 years ago
  92. f43f129 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 by TreeHugger Robot · 3 years ago
  93. 1ef5f42 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a by TreeHugger Robot · 3 years ago
  94. 50b65a1 Merge "Add caller check to com.android.credentials.RESET" into qt-dev by TreeHugger Robot · 3 years ago
  95. 8c93d2d [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 4002e2c124 -s ours am: 9d1b730058 -s ours by Edgar Wang · 3 years ago
  96. 2a6851f [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 9624c50ac3 -s ours am: 4154382e01 -s ours by Edgar Wang · 3 years ago
  97. 9d1b730 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 4002e2c124 -s ours by Edgar Wang · 3 years ago
  98. 4154382 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 9624c50ac3 -s ours by Edgar Wang · 3 years ago
  99. 4002e2c [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours by Edgar Wang · 3 years ago
  100. 9624c50 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours by Edgar Wang · 3 years ago