Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
change the japanese homepage Market link
to go to the Market dev site instead of the English market promo site
Change-Id: I81e8675355edee05540f291fdb2654fa44ae1ffa
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...
Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp
* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
This is a large batch, and covers:
-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()
-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()
-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()
-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI
-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()
I deprecated BluetoothIntent and moved each intent into the class it relates
to.
Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp
* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Mark cellular variants with the same availability, regardless of which are currently in use.
Availability just means the radio is enabled and sees the network, but has no guarantees that
we could connect to an APN if requested.
Fix the requestRouteToHost logic to support apn switches without WIFI.
bug:2093841
Merge commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23' into eclair-plus-aosp
* commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23':
AGL's glCompressedTexImage2D now checks the imageSize parameter.
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp
* commit '68f591b17537cb437ca0b25d00a6d3d08e507abb':
Try not to crash the system server because of corrupt restore data
When we're about to allocate an array based on the restore data for purposes of
unflattening a signature block, don't automatically assume that it's valid. If
it's corrupt [and we've seen this in practice] we can wind up trying to allocate
an array with 1.8 million objects, and throw an OutOfMemoryError, bringing down
the system.
This change arbitrarily decides that no package should have more than 20
signatures in its block, and aborts the restore if the metadata is thus revealed
to be corrupt.
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp
* commit '181b31a0d87d525ea64102a965210331e0c6885b':
Process: Add support for using scheduler policies instead of cgroups.
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp
* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
add documentation to notify developers about variable
camera specifications and add some more links
Change-Id: I46ef9811af17858cbc6547f88e626becb481b043
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp
* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
Allow an alternate eri file.
For testing purposes it is deseriable to allow
vendors to provide an alternate eri file. This
fixes Part A of bug 2108379.
Bug:2108379
Change-Id: I51703c9ac211ced053418e28e277dfab68deea21
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp
* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp
* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
Dialog titles would sometimes use a font too large.
Merge commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d' into eclair-plus-aosp
* commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d':
default dithering to ON (cheap, looks good)
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp
* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Some more tweaks and fixes to wallpapers. Make sure wallpapers are
told they are not visible when the screen is off. Add some new animations
for transitions across tasks, and fiddle with many of the existing
animations. Clean up the relationship between translucent activities
and animations. Add new API to start a PendingIntent from an
activity.
Change-Id: Ie0bf45fe44081bb6982c75361257a55d9cd9d863
