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

Commit 0781df94 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4129 into donut 

* changes:
  Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app Create a new public IntentSender class that can be used by PackageManager instead. This new class uses IIntentSender internally and can only be created by PendingIntent for now. Provide a new getIntentSender api in PendingIntent to create an instance of this class. Move IIntentSender and IIntentReceiver from android.app to android.content Change imports of IIntentSender and IIntentReceiver to reflect the new package name The PackageManager api has been named as freeStorageWithIntent and will be renamed as freeStorage once the older api(which has been deprecated) will be removed shortly.
parents 3571ff40 1ccac75e

Android.mk

+6 −5
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IAlarmManager.aidl \

        core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/IIntentReceiver.aidl \

	core/java/android/app/IIntentSender.aidl \

	core/java/android/app/INotificationManager.aidl \

	core/java/android/app/ISearchManager.aidl \

	core/java/android/app/ISearchManagerCallback.aidl \
@@ -90,6 +88,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothDeviceCallback.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

        core/java/android/content/IContentService.aidl \

	core/java/android/content/IIntentReceiver.aidl \

	core/java/android/content/IIntentSender.aidl \

	core/java/android/content/ISyncAdapter.aidl \

	core/java/android/content/ISyncContext.aidl \

        core/java/android/content/ISyncStatusObserver.aidl \
@@ -198,6 +198,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/app/PendingIntent.aidl \

	frameworks/base/core/java/android/content/ComponentName.aidl \

	frameworks/base/core/java/android/content/Intent.aidl \

	frameworks/base/core/java/android/content/IntentSender.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/res/Configuration.aidl \

	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

api/current.xml

+259 −0
Original line number Diff line number Diff line
@@ -22948,6 +22948,17 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getIntentSender"

 return="android.content.IntentSender"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getService"

 return="android.app.PendingIntent"

 abstract="false"
@@ -29629,6 +29640,70 @@ 
</parameter>

</method>

</interface>

<interface name="IIntentReceiver"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.IInterface">

</implements>

<method name="performReceive"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

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

</parameter>

<parameter name="extras" type="android.os.Bundle">

</parameter>

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

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<interface name="IIntentSender"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.IInterface">

</implements>

<method name="send"

 return="int"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

<parameter name="finishedReceiver" type="android.content.IIntentReceiver">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<class name="Intent"

 extends="java.lang.Object"

 abstract="false"
@@ -33648,6 +33723,190 @@ 
</parameter>

</constructor>

</class>

<class name="IntentSender"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="IntentSender"

 type="android.content.IntentSender"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="target" type="android.content.IIntentSender">

</parameter>

</constructor>

<constructor name="IntentSender"

 type="android.content.IntentSender"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="target" type="android.os.IBinder">

</parameter>

</constructor>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="readIntentSenderOrNullFromParcel"

 return="android.content.IntentSender"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="in" type="android.os.Parcel">

</parameter>

</method>

<method name="sendIntent"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

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

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

<parameter name="onFinished" type="android.content.IntentSender.OnFinished">

</parameter>

<parameter name="handler" type="android.os.Handler">

</parameter>

<exception name="IntentSender.SendIntentException" type="android.content.IntentSender.SendIntentException">

</exception>

</method>

<method name="writeIntentSenderOrNullToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="sender" type="android.content.IntentSender">

</parameter>

<parameter name="out" type="android.os.Parcel">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" type="android.os.Parcel">

</parameter>

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

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<interface name="IntentSender.OnFinished"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onSendFinished"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="IntentSender" type="android.content.IntentSender">

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

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

</parameter>

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

</parameter>

<parameter name="resultExtras" type="android.os.Bundle">

</parameter>

</method>

</interface>

<class name="IntentSender.SendIntentException"

 extends="android.util.AndroidException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

<constructor name="IntentSender.SendIntentException"

 type="android.content.IntentSender.SendIntentException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cause" type="java.lang.Exception">

</parameter>

</constructor>

</class>

<class name="MutableContextWrapper"

 extends="android.content.ContextWrapper"

 abstract="false"

core/java/android/app/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.ComponentName; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.IIntentSender;

import android.content.SharedPreferences;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

core/java/android/app/ActivityManagerNative.java

+2 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
package android.app;



import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IIntentSender;

import android.content.IIntentReceiver;

import android.content.pm.ApplicationInfo;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;

core/java/android/app/ActivityThread.java

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.ContentProvider; 
import android.content.Context;

import android.content.IContentProvider;

import android.content.Intent;

import android.content.IIntentReceiver;

import android.content.ServiceConnection;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;