diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-08-08 02:48:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 02:48:26 +0000 |
| commit | 1b9e3df7fe1d9f3562c40a43e85c30460047c64b (patch) | |
| tree | 6d92f3e280f0e4c579708559ba15a9c5ba594a86 /src | |
| parent | 503f6fa38a482b4bd13136a61081ce0be3a18fd4 (diff) | |
| parent | 10f8950a25fa4116759e52e454a7341822c19949 (diff) | |
am 10f8950a: am ef184932: am 5eb5437a: am f118b2b8: am 26b9e56b: Correctly check for ability to write to system settings
* commit '10f8950a25fa4116759e52e454a7341822c19949':
Correctly check for ability to write to system settings
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/settings/DialerSettingsActivity.java | 8 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/SoundSettingsFragment.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index abf854c08..c459d35c5 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -91,10 +91,10 @@ public class DialerSettingsActivity extends PreferenceActivity { @Override public void onHeaderClick(Header header, int position) { if (header.id == R.id.settings_header_sounds_and_vibration) { - // If we don't have the AppOp to write to system settings, go to system sound settings - // instead. Otherwise, perform the super implementation (which launches our own - // preference fragment. - if (!PermissionsUtil.hasAppOp(this, AppOpsManager.OPSTR_WRITE_SETTINGS)) { + // If we don't have the permission to write to system settings, go to system sound + // settings instead. Otherwise, perform the super implementation (which launches our + // own preference fragment. + if (!Settings.System.canWrite(this)) { Toast.makeText( this, getResources().getString(R.string.toast_cannot_write_system_settings), diff --git a/src/com/android/dialer/settings/SoundSettingsFragment.java b/src/com/android/dialer/settings/SoundSettingsFragment.java index 1dedcaaff..83847004d 100644 --- a/src/com/android/dialer/settings/SoundSettingsFragment.java +++ b/src/com/android/dialer/settings/SoundSettingsFragment.java @@ -132,7 +132,7 @@ public class SoundSettingsFragment extends PreferenceFragment public void onResume() { super.onResume(); - if (!PermissionsUtil.hasAppOp(getContext(), AppOpsManager.OPSTR_WRITE_SETTINGS)) { + if (!Settings.System.canWrite(getContext())) { // If the user launches this setting fragment, then toggles the WRITE_SYSTEM_SETTINGS // AppOp, then close the fragment since there is nothing useful to do. getActivity().onBackPressed(); @@ -155,7 +155,7 @@ public class SoundSettingsFragment extends PreferenceFragment */ @Override public boolean onPreferenceChange(Preference preference, Object objValue) { - if (!PermissionsUtil.hasAppOp(getContext(), AppOpsManager.OPSTR_WRITE_SETTINGS)) { + if (!Settings.System.canWrite(getContext())) { // A user shouldn't be able to get here, but this protects against monkey crashes. Toast.makeText( getContext(), @@ -181,7 +181,7 @@ public class SoundSettingsFragment extends PreferenceFragment */ @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (!PermissionsUtil.hasAppOp(getContext(), AppOpsManager.OPSTR_WRITE_SETTINGS)) { + if (!Settings.System.canWrite(getContext())) { Toast.makeText( getContext(), getResources().getString(R.string.toast_cannot_write_system_settings), |