diff options
| author | Doris Ling <dling@google.com> | 2018-05-31 14:56:28 -0700 |
|---|---|---|
| committer | Doris Ling <dling@google.com> | 2018-06-13 13:44:15 -0700 |
| commit | 6776da1cadaf73d19fc859e7e19574313ee8cc2c (patch) | |
| tree | 41252b63ca4bd283bfdc1ca84ae05964a72266fb /src/com/android/settings/development/FileEncryptionPreferenceController.java | |
| parent | 7a1d3d9f565618396d7267c9093d9b74fbea8bd3 (diff) | |
Do not turn on NFC automatically when airplane mode is off.
- besides checking the value for AIRPLANE_MODE_TOGGLEABLE_RADIOS, also
check the value for AIRPLANE_MODE_RADIOS to determine if we should turn
off NFC when airplane mode is on.
- when user turns off airplane mode, only re-enable the NFC preference
and do not enable NFC by default.
- remove listening to airplane mode directly from the android beam
preference controller, as it is already listening to Nfc state, which
handles the beam state already.
Change-Id: Id41fef15fb2de873729d20d7f53b1a88b164cf95
Fixes: 80217047
Test: make RunSettingsRoboTests
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions