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

Commit 3e69ec66 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of... 

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into upstream-2.3.5

Conflicts:
	core/java/android/content/pm/IPackageManager.aidl
	core/java/android/server/BluetoothService.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
	services/java/com/android/server/PackageManagerService.java
	telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: I254bd490297376ae8070fffcb07d4fe15afe3a8d
parent e69005e3

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -727,6 +727,17 @@ 
 visibility="public"

>

</field>

<field name="PREVENT_POWER_KEY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.PREVENT_POWER_KEY&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PROCESS_OUTGOING_CALLS"

 type="java.lang.String"

 transient="false"
@@ -197460,6 +197471,17 @@ 
 visibility="public"

>

</field>

<field name="PREVENT_POWER_KEY"

 type="int"

 transient="false"

 volatile="false"

 value="-2147483648"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SCREEN_BRIGHTNESS_CHANGED"

 type="int"

 transient="false"

cmds/pm/src/com/android/commands/pm/Pm.java

+19 −2
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ import android.content.pm.InstrumentationInfo; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.res.AssetManager;

import android.content.res.Resources;

import android.net.Uri;

import android.os.Parcel;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;



import java.io.File;

import java.lang.reflect.Field;
@@ -223,7 +224,7 @@ public final class Pm { 
        String filter = nextArg();



        try {

            List<PackageInfo> packages = mPm.getInstalledPackages(getFlags);

            final List<PackageInfo> packages = getInstalledPackages(mPm, getFlags);



            int count = packages.size();

            for (int p = 0 ; p < count ; p++) {
@@ -247,6 +248,22 @@ public final class Pm { 
        }

    }



    @SuppressWarnings("unchecked")

    private List<PackageInfo> getInstalledPackages(IPackageManager pm, int flags)

            throws RemoteException {

        final List<PackageInfo> packageInfos = new ArrayList<PackageInfo>();

        PackageInfo lastItem = null;

        ParceledListSlice<PackageInfo> slice;



        do {

            final String lastKey = lastItem != null ? lastItem.packageName : null;

            slice = pm.getInstalledPackages(flags, lastKey);

            lastItem = slice.populateList(packageInfos, PackageInfo.CREATOR);

        } while (!slice.isLastSlice());



        return packageInfos;

    }



    /**

     * Lists all of the features supported by the current device.

     *

core/java/android/app/ContextImpl.java

+26 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.content.pm.IPackageStatsObserver; 
import android.content.pm.InstrumentationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.ProviderInfo;
@@ -91,6 +92,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.IPowerManager;

import android.os.Looper;

import android.os.Parcel;

import android.os.PowerManager;

import android.os.Process;

import android.os.RemoteException;
@@ -2047,15 +2049,27 @@ class ContextImpl extends Context { 
            throw new NameNotFoundException("No shared userid for user:"+sharedUserName);

        }



        @SuppressWarnings("unchecked")

        @Override

        public List<PackageInfo> getInstalledPackages(int flags) {

            try {

                return mPM.getInstalledPackages(flags);

                final List<PackageInfo> packageInfos = new ArrayList<PackageInfo>();

                PackageInfo lastItem = null;

                ParceledListSlice<PackageInfo> slice;



                do {

                    final String lastKey = lastItem != null ? lastItem.packageName : null;

                    slice = mPM.getInstalledPackages(flags, lastKey);

                    lastItem = slice.populateList(packageInfos, PackageInfo.CREATOR);

                } while (!slice.isLastSlice());



                return packageInfos;

            } catch (RemoteException e) {

                throw new RuntimeException("Package manager has died", e);

            }

        }



        @SuppressWarnings("unchecked")

        @Override

        public List<PackageInfo> getInstalledThemePackages() {

            try {
@@ -2068,7 +2082,17 @@ class ContextImpl extends Context { 
        @Override

        public List<ApplicationInfo> getInstalledApplications(int flags) {

            try {

                return mPM.getInstalledApplications(flags);

                final List<ApplicationInfo> applicationInfos = new ArrayList<ApplicationInfo>();

                ApplicationInfo lastItem = null;

                ParceledListSlice<ApplicationInfo> slice;



                do {

                    final String lastKey = lastItem != null ? lastItem.packageName : null;

                    slice = mPM.getInstalledApplications(flags, lastKey);

                    lastItem = slice.populateList(applicationInfos, ApplicationInfo.CREATOR);

                } while (!slice.isLastSlice());



                return applicationInfos;

            } catch (RemoteException e) {

                throw new RuntimeException("Package manager has died", e);

            }

core/java/android/bluetooth/BluetoothA2dp.java

+16 −0
Original line number Diff line number Diff line
@@ -269,6 +269,22 @@ public final class BluetoothA2dp { 
        }

    }



    /**

     * Allow or disallow incoming connection

     * @param device Sink

     * @param value True / False

     * @return Success or Failure of the binder call.

     */

    public boolean allowIncomingConnect(BluetoothDevice device, boolean value) {

        if (DBG) log("allowIncomingConnect(" + device + ":" + value + ")");

        try {

            return mService.allowIncomingConnect(device, value);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            return false;

        }

    }



    /** Helper for converting a state to a string.

     * For debug use only - strings are not internationalized.

     * @hide

core/java/android/bluetooth/BluetoothDevice.java

+27 −0
Original line number Diff line number Diff line
@@ -276,6 +276,33 @@ public final class BluetoothDevice implements Parcelable { 
    public static final String ACTION_PAIRING_CANCEL =

            "android.bluetooth.device.action.PAIRING_CANCEL";



    /** @hide */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_REQUEST =

            "android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST";



    /** @hide */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_REPLY =

            "android.bluetooth.device.action.CONNECTION_ACCESS_REPLY";



    /** @hide */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_CANCEL =

            "android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL";

    /**

     * Used as an extra field in {@link #ACTION_CONNECTION_ACCESS_REPLY} intent.

     * @hide

     */

    public static final String EXTRA_CONNECTION_ACCESS_RESULT =

        "android.bluetooth.device.extra.CONNECTION_ACCESS_RESULT";



    /**@hide*/

    public static final int CONNECTION_ACCESS_YES = 1;



    /**@hide*/

    public static final int CONNECTION_ACCESS_NO = 2;



    /** A bond attempt succeeded

     * @hide */

    public static final int BOND_SUCCESS = 0;