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

Commit a21e0482 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge b3e942e3 on remote branch 

Change-Id: Ia6d749b1779ec74906c043538dff5213c8631015
parents 83cc62ac b3e942e3

core/java/android/accounts/AccountManager.java

+0 −4
Original line number Diff line number Diff line
@@ -2702,8 +2702,6 @@ public class AccountManager { 
     *         <ul>

     *         <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for

     *         adding the the to the device later.

     *         <li>{@link #KEY_PASSWORD} - optional, the password or password

     *         hash of the account.

     *         <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check

     *         status of the account

     *         </ul>
@@ -2791,8 +2789,6 @@ public class AccountManager { 
     *         <ul>

     *         <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for

     *         updating the local credentials on device later.

     *         <li>{@link #KEY_PASSWORD} - optional, the password or password

     *         hash of the account

     *         <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check

     *         status of the account

     *         </ul>

core/java/android/app/DownloadManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ public class DownloadManager { 
            if (cursor.moveToFirst()) {

                int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));

                if (DownloadManager.STATUS_SUCCESSFUL == status) {

                    return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);

                   return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);

                }

            }

        } finally {
@@ -1425,7 +1425,7 @@ public class DownloadManager { 
     * @hide

     */

    public Uri getDownloadUri(long id) {

        return ContentUris.withAppendedId(mBaseUri, id);

        return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);

    }



    /**
@@ -1519,7 +1519,7 @@ public class DownloadManager { 


            // return content URI for cache download

            long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));

            return ContentUris.withAppendedId(mBaseUri, downloadId).toString();

            return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();

        }



        private long getReason(int status) {

core/java/android/bluetooth/BluetoothDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -1164,12 +1164,12 @@ public final class BluetoothDevice implements Parcelable { 


    /**

     * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.

     *

     * @return true confirmation has been sent out

     *         false for error

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setPairingConfirmation(boolean confirm) {

        if (sService == null) {

            Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");

core/java/android/net/ConnectivityManager.java

+25 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.net.wifi.WifiDevice;

import android.os.Binder;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;
@@ -59,6 +60,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.net.InetAddress;

import java.util.HashMap;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.List;



/**

 * Class that answers queries about the state of network connectivity. It also
@@ -296,6 +298,15 @@ public class ConnectivityManager { 
    public static final String ACTION_TETHER_STATE_CHANGED =

            "android.net.conn.TETHER_STATE_CHANGED";



    /**

     * Broadcast intent action indicating that a Station is connected

     * or disconnected.

     *

     * @hide

     */

    public static final String TETHER_CONNECT_STATE_CHANGED =

        "codeaurora.net.conn.TETHER_CONNECT_STATE_CHANGED";



    /**

     * @hide

     * gives a String[] listing all the interfaces configured for
@@ -2142,6 +2153,20 @@ public class ConnectivityManager { 
        }

    }



    /**

     * Get the list of Stations connected to Hotspot.

     *

     * @return a list of {@link WifiDevice} objects.

     * {@hide}

     */

    public List<WifiDevice> getTetherConnectedSta() {

        try {

            return mService.getTetherConnectedSta();

        } catch (RemoteException e) {

            return null;

        }

    }



    /** {@hide} */

    public static final int TETHER_ERROR_NO_ERROR           = 0;

    /** {@hide} */

core/java/android/net/IConnectivityManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.NetworkQuotaInfo; 
import android.net.NetworkRequest;

import android.net.NetworkState;

import android.net.ProxyInfo;

import android.net.wifi.WifiDevice;

import android.os.IBinder;

import android.os.Messenger;

import android.os.ParcelFileDescriptor;
@@ -36,6 +37,8 @@ import com.android.internal.net.VpnConfig; 
import com.android.internal.net.VpnInfo;

import com.android.internal.net.VpnProfile;



import java.util.List;



/**

 * Interface that answers queries about, and allows changing, the

 * state of network connectivity.
@@ -97,6 +100,8 @@ interface IConnectivityManager 


    int setUsbTethering(boolean enable);



    List<WifiDevice> getTetherConnectedSta();



    void reportInetCondition(int networkType, int percentage);



    void reportNetworkConnectivity(in Network network, boolean hasConnectivity);