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

Commit d50d9397 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5053079 from 77c2e673 to pi-qpr2-release 

Change-Id: Id3c0d523b5de906851919cbee8d50c5a8c0af6d1
parents 2a11a4f3 77c2e673

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ public class Instrumentation { 
    /**

     * Like {@link #execStartActivity(android.content.Context, android.os.IBinder,

     * android.os.IBinder, String, android.content.Intent, int, android.os.Bundle)},

     * but for calls from a {#link Fragment}.

     * but for calls from a {@link Fragment}.

     * 

     * @param who The Context from which the activity is being started.

     * @param contextThread The main thread of the Context from which the activity

core/java/android/app/Service.java

+5 −5
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import android.annotation.IntDef; 
import android.annotation.Nullable;

import android.content.ComponentCallbacks2;

import android.content.ComponentName;

import android.content.Intent;

import android.content.ContextWrapper;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.Build;

import android.os.RemoteException;

import android.os.IBinder;

import android.os.RemoteException;

import android.util.Log;



import java.io.FileDescriptor;
@@ -390,7 +390,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
     * don't recreate until a future explicit call to

     * {@link Context#startService Context.startService(Intent)}.  The

     * service will not receive a {@link #onStartCommand(Intent, int, int)}

     * call with a null Intent because it will not be re-started if there

     * call with a null Intent because it will not be restarted if there

     * are no pending Intents to deliver.

     * 

     * <p>This mode makes sense for things that want to do some work as a
@@ -415,7 +415,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
     * redelivery until the service calls {@link #stopSelf(int)} with the

     * start ID provided to {@link #onStartCommand}.  The

     * service will not receive a {@link #onStartCommand(Intent, int, int)}

     * call with a null Intent because it will will only be re-started if

     * call with a null Intent because it will only be restarted if

     * it is not finished processing all Intents sent to it (and any such

     * pending events will be delivered at the point of restart).

     */

core/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -2797,7 +2797,7 @@ public final class BluetoothAdapter { 
     * socket will be encrypted.

     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {#link

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {@link

     * BluetoothServerSocket#getPsm()} and this value will be released when this server socket is

     * closed, Bluetooth is turned off, or the application exits unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is
@@ -2847,7 +2847,7 @@ public final class BluetoothAdapter { 
     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic protocol/service multiplexer (PSM) value. This PSM value

     * can be read from the {#link BluetoothServerSocket#getPsm()} and this value will be released

     * can be read from the {@link BluetoothServerSocket#getPsm()} and this value will be released

     * when this server socket is closed, Bluetooth is turned off, or the application exits

     * unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is

core/java/android/bluetooth/BluetoothDevice.java

+4 −4
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1601,7 +1601,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1658,7 +1658,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocketToServiceRecord}.

     * In such a case, use {@link #createInsecureRfcommSocketToServiceRecord}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Hint: If you are connecting to a Bluetooth serial board then try
@@ -1938,7 +1938,7 @@ public final class BluetoothDevice implements Parcelable { 
     * encrypted.

     * <p> Use this socket if an authenticated socket link is possible. Authentication refers

     * to the authentication of the link key to prevent man-in-the-middle type of attacks. When a

     * secure socket connection is not possible, use {#link createInsecureLeL2capCocSocket(int,

     * secure socket connection is not possible, use {@link createInsecureLeL2capCocSocket(int,

     * int)}.

     *

     * @param transport Bluetooth transport to use, must be {@link #TRANSPORT_LE}

core/java/android/bluetooth/BluetoothServerSocket.java

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public final class BluetoothServerSocket implements Closeable { 
    /**

     * Returns the assigned dynamic protocol/service multiplexer (PSM) value for the listening L2CAP

     * Connection-oriented Channel (CoC) server socket. This server socket must be returned by the

     * {#link BluetoothAdapter.listenUsingL2capCoc(int)} or {#link

     * {@link BluetoothAdapter.listenUsingL2capCoc(int)} or {@link

     * BluetoothAdapter.listenUsingInsecureL2capCoc(int)}. The returned value is undefined if this

     * method is called on non-L2CAP server sockets.

     *