OSDN Git Service

Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
authorCharles He <qiurui@google.com>
Wed, 6 Sep 2017 16:12:08 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 16:12:08 +0000 (16:12 +0000)
commit0a72c2339357bb6c512099539a78d973d8ba4a6f
treec99e5ea360f64309fead1c2e0e0a85ce3d13e7a5
parentd2a65d5f037da1e1b2cae1d0df22b7d02eac2d24
parente7cf5e62215863317457d26cb873e95eb6d66eed
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
am: e7cf5e6221

Change-Id: I356a58cadd3e19e61d9585f08e47c9d4cdcf4318
src/com/android/settings/wifi/WifiSettings.java
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java