Fix ringtone persistance after device rotation.

Bug: 26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
This commit is contained in:
Julia Reynolds
2016-04-01 14:45:58 -04:00
parent f9db17e3cc
commit c736efcb61
2 changed files with 26 additions and 14 deletions

View File

@@ -49,8 +49,6 @@ public class RingtonePreference extends Preference {
private static final String TAG = "RingtonePreference";
private static int sRequestCode = 100;
private int mRingtoneType;
private boolean mShowDefault;
private boolean mShowSilent;
@@ -213,24 +211,18 @@ public class RingtonePreference extends Preference {
}
protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
super.onAttachedToHierarchy(preferenceManager);
mRequestCode = sRequestCode++;
}
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == mRequestCode) {
if (data != null) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
if (data != null) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
if (callChangeListener(uri != null ? uri.toString() : "")) {
onSaveRingtone(uri);
}
if (callChangeListener(uri != null ? uri.toString() : "")) {
onSaveRingtone(uri);
}
return true;
}
return false;
return true;
}
}