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

Commit 02f5228c authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of f0d83fd9 to master

parents b2fe1fd4 f0d83fd9

api/current.xml

+0 −163
Original line number Diff line number Diff line
@@ -1024,17 +1024,6 @@ 
 visibility="public"

>

</field>

<field name="SHUTDOWN"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.SHUTDOWN&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SIGNAL_PERSISTENT_PROCESSES"

 type="java.lang.String"

 transient="false"
@@ -1057,17 +1046,6 @@ 
 visibility="public"

>

</field>

<field name="STOP_APP_SWITCHES"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.STOP_APP_SWITCHES&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SUBSCRIBED_FEEDS_READ"

 type="java.lang.String"

 transient="false"
@@ -31763,17 +31741,6 @@ 
 visibility="public"

>

</field>

<field name="BACKUP_SERVICE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;backup&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="BIND_AUTO_CREATE"

 type="int"

 transient="false"
@@ -32619,19 +32586,6 @@ 
<parameter name="mode" type="int">

</parameter>

</method>

<method name="getSharedPrefsFile"

 return="java.io.File"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getSystemService"

 return="java.lang.Object"

 abstract="false"
@@ -33426,70 +33380,6 @@ 
</exception>

</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"
@@ -37683,26 +37573,6 @@ 
>

<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"
@@ -51230,17 +51100,6 @@ 
<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="getLearner"

 return="android.gesture.Learner"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOrientationStyle"

 return="int"

 abstract="false"
@@ -52509,15 +52368,6 @@ 
>

</field>

</class>

<class name="Learner"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility=""

>

</class>

<class name="OrientedBoundingBox"

 extends="java.lang.Object"

 abstract="false"
@@ -123165,19 +123015,6 @@ 
<parameter name="mode" type="int">

</parameter>

</method>

<method name="getSharedPrefsFile"

 return="java.io.File"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="getSystemService"

 return="java.lang.Object"

 abstract="false"

core/java/android/accessibilityservice/AccessibilityService.java

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@ public abstract class AccessibilityService extends Service { 
        }

    }



    /**

     * Implement to return the implementation of the internal accessibility

     * service interface.  Subclasses should not override.

     */

    @Override

    public final IBinder onBind(Intent intent) {

        return new IEventListenerWrapper(this);

core/java/android/app/PendingIntent.java

+1 −6
Original line number Diff line number Diff line
@@ -273,11 +273,6 @@ public final class PendingIntent implements Parcelable { 
        return null;

    }



    private class IntentSenderWrapper extends IntentSender {

        protected IntentSenderWrapper(IIntentSender target) {

            super(target);

        }

    }

    /**

     * Retrieve a IntentSender object that wraps the existing sender of the PendingIntent

     *
@@ -285,7 +280,7 @@ public final class PendingIntent implements Parcelable { 
     *

     */

    public IntentSender getIntentSender() {

        return new IntentSenderWrapper(mTarget);

        return new IntentSender(mTarget);

    }



    /**

core/java/android/content/Context.java

+2 −1
Original line number Diff line number Diff line
@@ -1293,6 +1293,7 @@ public abstract class Context { 
     * Use with {@link #getSystemService} to retrieve an

     * {@blink android.backup.IBackupManager IBackupManager} for communicating

     * with the backup mechanism.

     * @hide

     * 

     * @see #getSystemService

     */

core/java/android/content/ContextWrapper.java

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ public class ContextWrapper extends Context { 
        return mBase.getPackageCodePath();

    }



    /** @hide */

    @Override

    public File getSharedPrefsFile(String name) {

        return mBase.getSharedPrefsFile(name);