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

Commit 1d37d0f7 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Add simple null checks to StorageWizard*, also listen to... 

the disk destroyed event.

Bug 21336042

Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
parent 0f6b243d

src/com/android/settings/deviceinfo/StorageWizardBase.java

+22 −0
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ import android.app.Activity; 
import android.graphics.Color;

import android.os.Bundle;

import android.os.storage.DiskInfo;

import android.os.storage.StorageEventListener;

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.os.storage.VolumeRecord;

import android.text.TextUtils;

import android.view.View;

import android.view.WindowManager;
@@ -63,6 +65,10 @@ public abstract class StorageWizardBase extends Activity implements NavigationBa 
        }



        setTheme(R.style.SuwThemeMaterial_Light);



        if (mDisk != null) {

            mStorage.registerListener(mStorageListener);

        }

    }



    @Override
@@ -82,6 +88,12 @@ public abstract class StorageWizardBase extends Activity implements NavigationBa 
        getBackButton().setVisibility(View.GONE);

    }



    @Override

    protected void onDestroy() {

        mStorage.unregisterListener(mStorageListener);

        super.onDestroy();

    }



    protected NavigationBar getNavigationBar() {

        return (NavigationBar) findViewById(R.id.suw_layout_navigation_bar);

    }
@@ -142,4 +154,14 @@ public abstract class StorageWizardBase extends Activity implements NavigationBa 
        }

        return null;

    }



    private final StorageEventListener mStorageListener = new StorageEventListener() {

        @Override

        public void onDiskDestroyed(DiskInfo disk) {

            // We know mDisk != null.

            if (mDisk.id.equals(disk.id)) {

                finish();

            }

        }

    };

}

src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java

+4 −2
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ public class StorageWizardFormatConfirm extends StorageWizardBase { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (mDisk == null) {

            finish();

            return;

        }

        setContentView(R.layout.storage_wizard_generic);



        Preconditions.checkNotNull(mDisk);



        mFormatPrivate = getIntent().getBooleanExtra(EXTRA_FORMAT_PRIVATE, false);



        if (mFormatPrivate) {

src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java

+4 −2
Original line number Diff line number Diff line
@@ -44,10 +44,12 @@ public class StorageWizardFormatProgress extends StorageWizardBase { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (mDisk == null) {

            finish();

            return;

        }

        setContentView(R.layout.storage_wizard_progress);



        Preconditions.checkNotNull(mDisk);



        mFormatPrivate = getIntent().getBooleanExtra(

                StorageWizardFormatConfirm.EXTRA_FORMAT_PRIVATE, false);

src/com/android/settings/deviceinfo/StorageWizardInit.java

+4 −2
Original line number Diff line number Diff line
@@ -34,10 +34,12 @@ public class StorageWizardInit extends StorageWizardBase { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (mDisk == null) {

            finish();

            return;

        }

        setContentView(R.layout.storage_wizard_init);



        Preconditions.checkNotNull(mDisk);



        setHeaderText(R.string.storage_wizard_init_title, mDisk.getDescription());



        mRadioExternal = (RadioButton) findViewById(R.id.storage_wizard_init_external_title);

src/com/android/settings/deviceinfo/StorageWizardMigrate.java

+4 −2
Original line number Diff line number Diff line
@@ -35,10 +35,12 @@ public class StorageWizardMigrate extends StorageWizardBase { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (mDisk == null) {

            finish();

            return;

        }

        setContentView(R.layout.storage_wizard_migrate);



        Preconditions.checkNotNull(mDisk);



        setHeaderText(R.string.storage_wizard_migrate_title, mDisk.getDescription());

        setBodyText(R.string.memory_calculating_size);