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

Commit caee1703 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'goog/readonly-p4-master'

parents 762d30a3 f0bc7ece

core/java/android/bluetooth/BluetoothDevice.java

+2 −1
Original line number Diff line number Diff line
@@ -485,7 +485,8 @@ public class BluetoothDevice { 
     * Get the major, minor and servics classes of a remote device.

     * These classes are encoded as a 32-bit integer. See BluetoothClass.

     * @param address remote device

     * @return 32-bit class suitable for use with BluetoothClass.

     * @return 32-bit class suitable for use with BluetoothClass, or

     *         BluetoothClass.ERROR on error

     */

    public int getRemoteClass(String address) {

        try {

core/java/android/os/BatteryStats.java

+308 −42

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/LocalPowerManager.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.os; 


/** @hide */

public interface LocalPowerManager {

    // Note: be sure to update BatteryStats if adding or modifying event constants.

    

    public static final int OTHER_EVENT = 0;

    public static final int CHEEK_EVENT = 1;

    public static final int TOUCH_EVENT = 2;  // touch events are TOUCH for 300ms, and then either

core/java/android/server/BluetoothDeviceService.java

+3 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


package android.server;



import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothError;

import android.bluetooth.BluetoothHeadset;
@@ -971,7 +972,7 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub { 
    public synchronized int getRemoteClass(String address) {

        if (!BluetoothDevice.checkBluetoothAddress(address)) {

            mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

            return -1;

            return BluetoothClass.ERROR;

        }

        return getRemoteClassNative(address);

    }
@@ -1254,4 +1255,3 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub { 
        Log.d(TAG, msg);

    }

}

core/java/android/text/StaticLayout.java

+53 −4

File changed.

Preview size limit exceeded, changes collapsed.