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

Commit 66d30af8 authored by Amit Kumar's avatar Amit Kumar
Browse files

Merge branch 'eelo-0.1' of https://gitlab.eelo.io/eelo/android_frameworks_base into my-dev

parents 568ae6d0 e5de3394

core/java/android/app/job/JobInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class JobInfo implements Parcelable { 
    public static final int BACKOFF_POLICY_EXPONENTIAL = 1;



    /* Minimum interval for a periodic job, in milliseconds. */

    private static final long MIN_PERIOD_MILLIS = 15 * 60 * 1000L;   // 15 minutes

    private static final long MIN_PERIOD_MILLIS = 2 * 60 * 1000L;   // 2 minutes (Default is 15 minutes)



    /* Minimum flex for a periodic job, in milliseconds. */

    private static final long MIN_FLEX_MILLIS = 5 * 60 * 1000L; // 5 minutes

core/java/android/bluetooth/BluetoothDevice.java

+5 −1
Original line number Diff line number Diff line
@@ -727,7 +727,11 @@ public final class BluetoothDevice implements Parcelable { 
            return null;

        }

        try {

            return sService.getRemoteName(this);

            String name = sService.getRemoteName(this);

            if (name != null) {

                return name.replaceAll("[\\t\\n\\r]+", " ");

            }

            return null;

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return null;

    }