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

Commit 772a8969 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge commit 'remotes/korg/cupcake' 

Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java
parents d34e5967 e09fd9e8

awt/java/awt/AWTEvent.java

+350 −287

File changed.

Preview size limit exceeded, changes collapsed.

awt/java/awt/AWTException.java

+11 −7
Original line number Diff line number Diff line
@@ -18,26 +18,30 @@ 
 * @author Michael Danilov

 * @version $Revision$

 */

package java.awt;



package java.awt;



/**

 * The AWTException class is used to provide notification and information

 * about AWT errors.

 * The AWTException class is used to provide notification and information about

 * AWT errors.

 * 

 * @since Android 1.0

 */

public class AWTException extends Exception {



    /** The Constant serialVersionUID. */

    /**

     * The Constant serialVersionUID.

     */

    private static final long serialVersionUID = -1900414231151323879L;



    /**

     * Instantiates a new AWT exception with the specified message.

     * 

     * @param msg the specific message for current exception.

     * @param msg

     *            the specific message for current exception.

     */

    public AWTException(String msg) {

        super(msg);

    }



}

awt/java/awt/AWTKeyStroke.java

+268 −234

File changed.

Preview size limit exceeded, changes collapsed.

awt/java/awt/AWTPermission.java

+15 −8
Original line number Diff line number Diff line
@@ -18,24 +18,31 @@ 
 * @author Pavel Dolgov

 * @version $Revision$

 */



package java.awt;



import java.security.BasicPermission;



/**

 * The AWTPermission specifies the name of the permission and the 

 * corresponding action list.

 * The AWTPermission specifies the name of the permission and the corresponding

 * action list.

 * 

 * @since Android 1.0

 */

public final class AWTPermission extends BasicPermission {



    /** The Constant serialVersionUID. */

    /**

     * The Constant serialVersionUID.

     */

    private static final long serialVersionUID = 8890392402588814465L;



    /**

     * Instantiates a new AWTPermission with defined name and actions.

     * 

     * @param name the name of a new AWTPermission. 

     * @param actions the actions of a new AWTPermission.

     * @param name

     *            the name of a new AWTPermission.

     * @param actions

     *            the actions of a new AWTPermission.

     */

    public AWTPermission(String name, String actions) {

        super(name, actions);
@@ -44,11 +51,11 @@ public final class AWTPermission extends BasicPermission { 
    /**

     * Instantiates a new AWT permission with the defined name.

     * 

     * @param name the name of a new AWTPermission. 

     * @param name

     *            the name of a new AWTPermission.

     */

    public AWTPermission(String name) {

        super(name);

    }



}

awt/java/awt/ActiveEvent.java

+8 −5
Original line number Diff line number Diff line
@@ -18,18 +18,21 @@ 
 * @author Michael Danilov

 * @version $Revision$

 */



package java.awt;



/**

 * This interface defines events that know how to dispatch themselves. 

 * Such event can be placed upon the event queue and its dispatch method 

 * will be called when the event is dispatched.

 * This interface defines events that know how to dispatch themselves. Such

 * event can be placed upon the event queue and its dispatch method will be

 * called when the event is dispatched.

 * 

 * @since Android 1.0

 */

public interface ActiveEvent {



    /**

     * Dispatches the event to the listeners of the event's source, 

     * or does whatever it is this event is supposed to do.

     * Dispatches the event to the listeners of the event's source, or does

     * whatever it is this event is supposed to do.

     */

    public void dispatch();