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

Commit b1043404 authored by San Mehat's avatar San Mehat
Browse files

Framework: Clean up / Refactor Mount APIs 



 - Move android.storage.* -> android.os.storage.* and refactor users
 - Refactor generic shares back to explicit ums enable/disable/isEnabled
 - Remove media insert/removed event callbacks (not ready for Froyo)
 - Remove 'label' from volume state change callbacks
 - Add public API functions for enabling/disabling USB mass storage (permissions enforced
   in MountSevice)
 - Remove some stray un-needed import lines
 - Move android.os.IMountService / android.os.IMountServiceListener -> android.os.storage
 - Improve code comments

Updated:
  MountService: Add dup state check and move debugging behind a conditional
  UsbStorageActivity: Fix review comments + a TODO
  StorageNotification: Add @Override tags
  StorageManager: Don't use a static Listener list
  MountService: Reduce bloat and fix == where I meant .equals()
  PackageManagerTests: Update for new API

Signed-off-by: default avatarSan Mehat <san@google.com>
parent 3ee13171

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/net/INetworkManagementEventObserver.aidl \

	core/java/android/os/ICheckinService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/IMountService.aidl \

	core/java/android/os/IMountServiceListener.aidl \

	core/java/android/os/storage/IMountService.aidl \

	core/java/android/os/storage/IMountServiceListener.aidl \

	core/java/android/os/INetworkManagementService.aidl \

	core/java/android/os/INetStatService.aidl \

	core/java/android/os/IParentalControlCallback.aidl \

api/current.xml

+212 −120
Original line number Diff line number Diff line
@@ -117646,6 +117646,218 @@ 
</method>

</class>

</package>

<package name="android.os.storage"

>

<class name="StorageEventListener"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="StorageEventListener"

 type="android.os.storage.StorageEventListener"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="onStorageStateChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="oldState" type="java.lang.String">

</parameter>

<parameter name="newState" type="java.lang.String">

</parameter>

</method>

<method name="onUsbMassStorageConnectionChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="connected" type="boolean">

</parameter>

</method>

</class>

<class name="StorageManager"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="disableUsbMassStorage"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="enableUsbMassStorage"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isUsbMassStorageConnected"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isUsbMassStorageEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="registerListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.os.storage.StorageEventListener">

</parameter>

</method>

<method name="unregisterListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.os.storage.StorageEventListener">

</parameter>

</method>

</class>

<class name="StorageResultCode"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="StorageResultCode"

 type="android.os.storage.StorageResultCode"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<field name="OperationFailedInternalError"

 type="int"

 transient="false"

 volatile="false"

 value="-1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OperationFailedMediaBlank"

 type="int"

 transient="false"

 volatile="false"

 value="-3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OperationFailedMediaCorrupt"

 type="int"

 transient="false"

 volatile="false"

 value="-4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OperationFailedNoMedia"

 type="int"

 transient="false"

 volatile="false"

 value="-2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OperationFailedVolumeNotMounted"

 type="int"

 transient="false"

 volatile="false"

 value="-5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OperationSucceeded"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.preference"

>

<class name="CheckBoxPreference"
@@ -136301,126 +136513,6 @@ 
</method>

</interface>

</package>

<package name="android.storage"

>

<interface name="StorageEventListener"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onMediaInserted"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.String">

</parameter>

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="major" type="int">

</parameter>

<parameter name="minor" type="int">

</parameter>

</method>

<method name="onMediaRemoved"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.String">

</parameter>

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="major" type="int">

</parameter>

<parameter name="minor" type="int">

</parameter>

<parameter name="clean" type="boolean">

</parameter>

</method>

<method name="onShareAvailabilityChanged"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="method" type="java.lang.String">

</parameter>

<parameter name="available" type="boolean">

</parameter>

</method>

<method name="onVolumeStateChanged"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.String">

</parameter>

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="oldState" type="java.lang.String">

</parameter>

<parameter name="newState" type="java.lang.String">

</parameter>

</method>

</interface>

<class name="StorageManager"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="registerListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.storage.StorageEventListener">

</parameter>

</method>

<method name="unregisterListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.storage.StorageEventListener">

</parameter>

</method>

</class>

</package>

<package name="android.telephony"

>

<class name="CellLocation"

core/java/android/app/ContextImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ import android.os.ServiceManager; 
import android.os.StatFs;

import android.os.Vibrator;

import android.os.FileUtils.FileStatus;

import android.storage.StorageManager;

import android.os.storage.StorageManager;

import android.telephony.TelephonyManager;

import android.text.ClipboardManager;

import android.util.AndroidRuntimeException;

core/java/android/content/Context.java

+3 −3
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ public abstract class Context { 
     * @see #SENSOR_SERVICE

     * @see android.hardware.SensorManager

     * @see #STORAGE_SERVICE

     * @see android.storage.StorageManager

     * @see android.os.storage.StorageManager

     * @see #VIBRATOR_SERVICE

     * @see android.os.Vibrator

     * @see #CONNECTIVITY_SERVICE
@@ -1243,11 +1243,11 @@ public abstract class Context { 
    

    /**

     * Use with {@link #getSystemService} to retrieve a {@link

     * android.storage.StorageManager} for accesssing system storage

     * android.os.storage.StorageManager} for accesssing system storage

     * functions.

     *

     * @see #getSystemService

     * @see android.storage.StorageManager

     * @see android.os.storage.StorageManager

     */

    public static final String STORAGE_SERVICE = "storage";

core/java/android/os/Environment.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.os; 


import java.io.File;



import android.os.IMountService;

import android.os.storage.IMountService;



/**

 * Provides access to environment variables.