Google Git
Sign in
android / platform / frameworks / base / 80859523ac4b
commit80859523ac4b0a8a333670f2e28961ab8d392818[log] [tgz]
authorYvonne Jiang <yvonnejiang@google.com>Fri Aug 15 03:15:05 2025 -0700
committerYvonne Jiang <yvonnejiang@google.com>Fri Aug 15 03:15:05 2025 -0700
tree82afd731ccfc6a163751b9f92d1200ab502e5e60
parent1d5e772d1d23fb2622d24270f62c8f9245e9b96b [diff]
Update SupervisionIntentProvider#getSettingsIntent to return null if supervision is disabled.

This fixes a bug where the implementation did not match the documented
and expected behavior.

Bug: 438120434
Test: atest SupervisionIntentProviderTest
Flag: android.app.supervision.flags.enable_supervision_settings_screen

Change-Id: I3544437240af361988471e8ea00d0c65009bfe51
2 files changed
tree: 82afd731ccfc6a163751b9f92d1200ab502e5e60
  1. .prebuilt_info/
  2. android-sdk-flags/
  3. apct-tests/
  4. apex/
  5. api/
  6. boot/
  7. cmds/
  8. config/
  9. core/
  10. data/
  11. docs/
  12. drm/
  13. errorprone/
  14. graphics/
  15. identity/
  16. keystore/
  17. libs/
  18. location/
  19. media/
  20. mime/
  21. mms/
  22. native/
  23. nfc-extras/
  24. nfc-non-updatable/
  25. obex/
  26. omapi/
  27. opengl/
  28. packages/
  29. proto/
  30. ravenwood/
  31. rs/
  32. samples/
  33. sax/
  34. services/
  35. startop/
  36. telecomm/
  37. telephony/
  38. test-base/
  39. test-junit/
  40. test-legacy/
  41. test-mock/
  42. test-runner/
  43. tests/
  44. tools/
  45. vendor/
  46. wifi/
  47. .clang-format
  48. .gitignore
  49. .mailmap
  50. AconfigFlags.bp
  51. ACTIVITY_MANAGER_OWNERS
  52. ACTIVITY_SECURITY_OWNERS
  53. ADPF_OWNERS
  54. Android.bp
  55. BAL_OWNERS
  56. BATTERY_STATS_OWNERS
  57. BROADCASTS_OWNERS
  58. checkstyle.xml
  59. checkstyle_suppressions.xml
  60. CleanSpec.mk
  61. FF_LEADS_OWNERS
  62. framework-jarjar-rules.txt
  63. GAME_MANAGER_OWNERS
  64. INPUT_OWNERS
  65. INTENT_OWNERS
  66. libcore-readonly.aconfig
  67. lint-baseline.xml
  68. LSE_APP_COMPAT_OWNERS
  69. MEMORY_OWNERS
  70. MESSAGE_QUEUE_OWNERS
  71. METADATA
  72. MODULE_LICENSE_APACHE2
  73. MULTIUSER_OWNERS
  74. NOTICE
  75. OOM_ADJUSTER_OWNERS
  76. OWNERS
  77. OWNERS.md
  78. PACKAGE_MANAGER_OWNERS
  79. pathmap.mk
  80. PERFETTO_OWNERS
  81. PERFORMANCE_OWNERS
  82. PREUPLOAD.cfg
  83. PREUPLOAD_OWNERS
  84. ProtoLibraries.bp
  85. Ravenwood.bp
  86. SDK_OWNERS
  87. SECURITY_STATE_OWNERS
  88. SQLITE_OWNERS
  89. TEST_MAPPING
  90. TestProtoLibraries.bp
  91. THERMAL_OWNERS
  92. TRACE_OWNERS
  93. TRADE_IN_MODE_OWNERS
  94. WEAR_OWNERS
  95. ZYGOTE_OWNERS