diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
| commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
| tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java | |
| parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java')
| -rw-r--r-- | java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java index 79abff08e..9cf145b7a 100644 --- a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java +++ b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java @@ -67,7 +67,9 @@ public class MotorolaHiddenMenuKeySequence { } private MotorolaHiddenMenuKeySequence(Context context) { - featureHiddenMenuEnabled = MotorolaUtils.isSupportingHiddenMenu(context); + featureHiddenMenuEnabled = + MotorolaUtils.isSpnMatched(context) + && context.getResources().getBoolean(R.bool.motorola_feature_hidden_menu); // In case we do have a SPN from resource we need to match from service; otherwise we are // free to go if (featureHiddenMenuEnabled) { |