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

Commit ffbc4b94 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread

parents de846ac6 d39d515b

core/res/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -1332,10 +1332,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"

                android:theme="@style/Theme.Dialog.Alert"

                android:excludeFromRecents="true">

        </activity>



        <activity android:name="android.accounts.ChooseAccountActivity"

                android:excludeFromRecents="true"

packages/SystemUI/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
        <activity android:name=".usb.UsbStorageActivity"

                android:excludeFromRecents="true">

        </activity>

        <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"

                android:theme="@*android:style/Theme.Dialog.Alert"

                android:excludeFromRecents="true">

        </activity>



    </application>

</manifest>

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+10 −20
Original line number Diff line number Diff line
@@ -16,33 +16,17 @@ 


package com.android.systemui.usb;



import android.app.Activity;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Environment;

import android.os.Handler;

import android.os.storage.IMountService;

import android.os.Message;

import android.os.ServiceManager;

import android.os.storage.StorageEventListener;

import android.os.storage.StorageManager;

import android.os.storage.StorageResultCode;

import android.provider.Settings;

import android.util.Slog;

import android.view.View;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;

import android.widget.Toast;



public class StorageNotification extends StorageEventListener {

    private static final String TAG = "StorageNotification";
@@ -165,10 +149,16 @@ public class StorageNotification extends StorageEventListener { 
                     * Show safe to unmount media notification, and enable UMS

                     * notification if connected.

                     */

                    if (Environment.isExternalStorageRemovable()) {

                        setMediaStorageNotification(

                                com.android.internal.R.string.ext_media_safe_unmount_notification_title,

                                com.android.internal.R.string.ext_media_safe_unmount_notification_message,

                                com.android.internal.R.drawable.stat_notify_sdcard, true, true, null);

                    } else {

                        // This device does not have removable storage, so

                        // don't tell the user they can remove it.

                        setMediaStorageNotification(0, 0, 0, false, false, null);

                    }

                    updateUsbMassStorageNotification(mUmsAvailable);

                }

            } else {