OSDN Git Service

DO NOT MERGE - Allow FR in carrier demo mode
authorChristine Franks <christyfranks@google.com>
Tue, 24 Jan 2017 00:44:02 +0000 (16:44 -0800)
committerChristine Franks <christyfranks@google.com>
Wed, 1 Feb 2017 00:37:45 +0000 (00:37 +0000)
commitbb6859ca751e5813685ef8a71bebe22381ce575b
tree0a2b9e83bc99f6bad64d7e1ad2bae69e0e0f7684
parent2a3b062c4ac7f6f2a13b0500226785e8cbbb4c01
DO NOT MERGE - Allow FR in carrier demo mode

Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.

Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
src/com/android/settings/MasterClear.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/Utils.java