app_Settings

Go to file

Alex Johnston 1867db33c9 Prevent location for the work profile from being enabled

* Previously the user could still enable location for the work profile
  even after enabling DISALLOW_CONFIG_LOCATION. This was because the
  LocationForWorkPreferenceController checked whether the base restriction
  was set and whether the restriction was enforced by the admin in the
  same condition.
* This was fixed by giving the admin precedence and moving the check for
  the base restriction to only be checked if the admin has not enforced
  the DISALLOW_CONFIG_LOCATION or DISALLOW_SHARING_LOCATION restriction.

Bug: 147758996
Test: Manual testing with Settings and TestDPC
      atest com.android.settings.location.LocationForWorkPreferenceControllerTest

Change-Id: Ide341f2dab4f59f26ffa0c929ba412d61b6ebf1a

2020-01-30 16:59:33 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Merge "Add IKEv2/IPsec VPN options" am: b189ffb318 am: 9d5397ab42 am: b9df8248fa

2020-01-24 07:59:53 +00:00

src/com/android/settings

Prevent location for the work profile from being enabled