30099 Commits

Author SHA1 Message Date
Hung-ying Tyan
cc019c0caa Merge "Get mute state from active call." into gingerbread 2011-01-24 21:13:08 -08:00
Hung-ying Tyan
8a424af1d9 am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-24 19:44:56 -08:00
Hung-ying Tyan
14b6d0620b Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-24 19:41:42 -08:00
Jeff Brown
e9acc40151 am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-24 17:38:32 -08:00
Jeff Brown
d8bdc06f81 Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
Fixed a bug in the handling of SENSOR_LANDSCAPE and SENSOR_PORTAIT
on devices that have a natural landscape orientation.  The old code
was disabling 180 degree orientation detection when it shouldn't have.

Bug: 3381359
Change-Id: I19bd2519e7f69a24835840fbf542aa7349981029
2011-01-24 17:07:36 -08:00
Andreas Huber
ca1cf59f49 am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-24 16:30:12 -08:00
Andreas Huber
efebdf4bd4 DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
2011-01-24 15:59:14 -08:00
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Brad Fitzpatrick
996de2dd41 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Justin Ho
7cd1cc8319 am 28c4f69a: Updated checkbox assets
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
  Updated checkbox assets
2011-01-24 13:08:54 -08:00
Justin Ho
28c4f69a93 Updated checkbox assets
Change-Id: I93c979816bc3310c510bf8942c273ce8c411150d
2011-01-24 13:05:06 -08:00
Arnaud Ferir
10ab8617e8 am 5e81a6e2: Fix trace mismatch.
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
2011-01-24 10:49:40 -08:00
Sylvain Fonteneau
e97a42e05c am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-24 10:49:36 -08:00
Arnaud Ferir
5e81a6e21e Fix trace mismatch.
Change-Id: Ie6e9a2baef63d2b5621593203742c2ffeaafc4ba
2011-01-24 12:15:21 -06:00
Sylvain Fonteneau
c5a418ecb7 Handle mock tags in android.nfc.Tag conversion to Parcel.
When generating a mock tag (after a NDEF exchange over LLCP), one of
the internal fields is set to null. This was causing NullPointerException
when being converted to a Parcel.

This is fixed by not including this field in the Parcel for mock tags.

Change-Id: I000e2faa54d71fd755ba7993e1e258743aad98fb
2011-01-24 12:15:13 -06:00
John Wang
78eb92388c am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
2011-01-24 09:26:56 -08:00
John Wang
93300ce2d3 Merge "Enable recovery in RIL wakelock release check." into gingerbread 2011-01-24 09:14:14 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00
Marco Nelissen
dbc0fe985f Increase the number of useful bits in the spectrum.
Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
2011-01-24 08:47:55 -08:00
Nick Pelly
0065f398c1 am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
  Add operands to mifare classic increment, decrement.
2011-01-23 22:14:54 -08:00
Nick Pelly
c896d85c15 Merge "Add operands to mifare classic increment, decrement." into gingerbread 2011-01-23 22:12:25 -08:00
Nick Pelly
1e233af3a7 Add operands to mifare classic increment, decrement.
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
2011-01-23 22:11:44 -08:00
Nick Pelly
12619677b0 am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
  Make MifareClassic methods more consistent.
2011-01-23 21:39:39 -08:00
Nick Pelly
da01b4abb8 Merge "Make MifareClassic methods more consistent." into gingerbread 2011-01-23 21:36:14 -08:00
Nick Pelly
e45083b11b Make MifareClassic methods more consistent.
Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.

o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
    make it really clear that authentication is per sector, and reduce function
    explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
    get rid of magic boolean
o remove all (int sector, int block) parameters
    always address by absolute block. this makes the API crystal clear, and
    helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.

Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5
2011-01-23 21:32:57 -08:00
Jeff Hamilton
535ec16c78 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
2011-01-23 19:28:17 -08:00
Jeff Hamilton
e1e70c5761 Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 2011-01-23 19:17:22 -08:00
Jim Miller
1323ab83e4 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-23 14:30:07 -08:00
Jim Miller
42a461570b Fix 3379239: Catch exceptions from workaround for OOM.
This catches possible exceptions caused by attempting to
unregister a receiver that may have already been unregistered.
This is related to the OOM issue workaround in Change I99a7e0c3.

Change-Id: Ib69a8acc6b12659125c958a03efac0a8a68a3859
2011-01-23 13:40:31 -08:00
Dianne Hackborn
1240719ae0 am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
* commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a':
  aapt: Allow raw "%" in unformatted string-arrays
2011-01-23 12:57:33 -08:00
Dianne Hackborn
bcf2adeb10 Merge "aapt: Allow raw "%" in unformatted string-arrays" 2011-01-23 12:44:13 -08:00
Jeff Hamilton
9f20cd7ff2 Allow null filters for foreground dispatch to act as catch all.
Change-Id: Idf3d2e344a6e87035ccb5b533ed9e81fec596132
2011-01-23 12:15:28 -06:00
Jeff Brown
c3563eb9e7 am 265cf2e7: Merge "Fix getSwitchState."
* commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef':
  Fix getSwitchState.
2011-01-22 21:32:58 -08:00
Jeff Brown
265cf2e76b Merge "Fix getSwitchState." 2011-01-22 21:23:19 -08:00
Josh Stone
bf50322a24 aapt: Allow raw "%" in unformatted string-arrays
Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
2011-01-22 21:13:12 -08:00
Dianne Hackborn
6d92cde287 am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
* commit '35f4d32dc2f0c383323e780ecc7e2764704c5d2c':
  frameworks/base: Track owner in appropriate owners list of Uri
2011-01-22 11:50:41 -08:00
Dianne Hackborn
35f4d32dc2 Merge "frameworks/base: Track owner in appropriate owners list of Uri" 2011-01-22 11:26:05 -08:00
Jaikumar Ganesh
f643974954 am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
2011-01-21 21:36:32 -08:00
Jaikumar Ganesh
1c9761e30d Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 2011-01-21 21:25:01 -08:00
Jaikumar Ganesh
40e6c210f8 Do Not Merge Connect other profiles when priority is auto connect.
ACL auto connection was removed so other profiles
won't auto connect when priority was auto connect.

Reduced connect other profiles time delay.

Bug: 3281016
Change-Id: Ic56ca6e95f618f02bc316d1f80014e58c4b6c3bc
2011-01-21 19:05:54 -08:00
Vairavan Srinivasan
91c12c27ef frameworks/base: Track owner in appropriate owners list of Uri
The owner isn't kept track it URI's writeOwners when
grantUriPermissionUncheckedLocked is invoked to provide both
read and write access to the URI. Fix is to check for both
read and write permissions and add owner to appropriate lists.

Change-Id: Id23688b96aefeb0a4911ee52ad47124bc5904fa0
2011-01-21 18:26:06 -08:00
John Wang
696794fc13 Enable recovery in RIL wakelock release check.
Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.

and

2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.

Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.

bug: 3369427, 3370827
Change-Id: Ib2fc54db3b155bd3fb1296ad83720b7836708caf
2011-01-21 17:46:08 -08:00
John Reck
3cc8a3a47e am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '398a589ccea744556732b25097412dbb22c51271':
  DO NOT MERGE - Create db path if it doesn't exit
2011-01-21 14:06:08 -08:00
John Reck
398a589cce Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread 2011-01-21 14:03:30 -08:00
Jeff Hamilton
0c5e2b3f13 am dc54a8c7: Merge "API changes for NFC." into gingerbread
* commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599':
  API changes for NFC.
2011-01-21 12:33:55 -08:00
Jeff Hamilton
446aea40eb API changes for NFC.
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 12:33:49 -08:00
John Reck
bf8af78973 DO NOT MERGE - Create db path if it doesn't exit
Bug: 3241808
 Make sure the directory the caller is trying to open the icon db
 in actually exists and create it if it doesn't.

Change-Id: Icc0a67b0ceba03a746ac2cd3b84fc34c2c8b4fe2
2011-01-21 11:42:15 -08:00
Jeff Hamilton
dc54a8c742 Merge "API changes for NFC." into gingerbread 2011-01-21 11:34:20 -08:00
Jeff Hamilton
4e21e1d21a API changes for NFC.
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 13:32:58 -06:00
Dianne Hackborn
15efe4cb4c am a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
* commit 'a8069f34f65bee858d87fd232a872a62e85a502b':
  Fixes Keyboard availability in "Providing Resources" documentation page.
2011-01-21 09:55:16 -08:00