Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f90fa1a0 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 75c1b73d: am 40090708: am 4547e528: merge from open-source master

parents f6e9a082 75c1b73d
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -23,13 +23,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.storage.IMountService;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.Environment;
import android.widget.Toast;
import android.util.Log;

/**
@@ -38,7 +35,7 @@ import android.util.Log;
 */
public class ExternalMediaFormatActivity extends AlertActivity implements DialogInterface.OnClickListener {

    private static final int POSITIVE_BUTTON = AlertDialog.BUTTON1;
    private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;

    /** Used to detect when the media state changes, in case we need to call finish() */
    private BroadcastReceiver mStorageReceiver = new BroadcastReceiver() {
+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public final class RingtonePickerActivity extends AlertActivity implements
     * On click of Ok/Cancel buttons
     */
    public void onClick(DialogInterface dialog, int which) {
        boolean positiveResult = which == BUTTON1;
        boolean positiveResult = which == DialogInterface.BUTTON_POSITIVE;
        
        // Stop playing the previous ringtone
        mRingtoneManager.stopPreviousRingtone();