Commit Graph

20168 Commits

Author SHA1 Message Date
Nick Pelly
84680db3b5 Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread 2011-01-03 22:38:14 -08:00
Nick Pelly
f75645f66d am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb':
  Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:35:49 -08:00
Nick Pelly
ddf6027ea3 Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread 2011-01-03 22:32:56 -08:00
Nick Pelly
775997cf4d am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
  Added getType() to NDEF technology class (API part).
2011-01-03 21:01:01 -08:00
Nick Pelly
610d72deb5 Merge "Added getType() to NDEF technology class (API part)." into gingerbread 2011-01-03 20:58:26 -08:00
Nick Pelly
139ac3e470 am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '8c09ef91aef0706a012e449ba3d16c03e0d64508':
  Removed selectAid() from IsoDep.
2011-01-03 20:11:08 -08:00
Nick Pelly
5c5258a1da Merge "Removed selectAid() from IsoDep." into gingerbread 2011-01-03 20:09:03 -08:00
Nick Pelly
9b21188c5a am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '4b94dee8336a1135e4fc67a5911223bb5aabad99':
  Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:34:37 -08:00
Nick Pelly
af84317c80 Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread 2011-01-03 18:33:09 -08:00
John Wang
64a7e1f026 am 06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
  Clear request list while timeout.
2011-01-03 08:46:47 -08:00
John Wang
d9883db5c5 Merge "Clear request list while timeout." into gingerbread 2011-01-03 08:44:17 -08:00
Jean-Baptiste Queru
f8b1da6be5 am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00
Jean-Baptiste Queru
19104d5357 Merge "according to rfc2617, nc-value = 8LHEX" 2010-12-28 15:33:10 -08:00
Alon Albert
8edbe22afe am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '672ebb61a755e4bbe60e4e884b1adadf186733b6':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 14:57:09 -08:00
Alon Albert
d3b9dc712b Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread 2010-12-28 14:44:51 -08:00
Jean-Baptiste Queru
587567a9b5 am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit 'bfb5f5966b36c4960b56f6de10ba261332208db9':
  Fix for writing empty strings to Parcel::writeString8()
2010-12-28 11:39:21 -08:00
Jean-Baptiste Queru
fb1a3da503 Merge "Fix for writing empty strings to Parcel::writeString8()" 2010-12-28 11:25:50 -08:00
Jean-Baptiste Queru
bbdb0c95bc am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
  The phone is crashing when unknown mime content is transferred.
2010-12-28 10:55:04 -08:00
Dianne Hackborn
2a5a251726 am 949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '949fc0efc3203c580372e7713df5331818ae81f1':
  frameworks/base: Fix to release references to previous live wallpaper
2010-12-28 10:38:38 -08:00
Dianne Hackborn
8097e174fe am 6c5d151b: Merge "frameworks/base: Fix to release references in ActivityManagerService"
* commit '6c5d151b29d7ae311267fa44048fbadb759b7a5a':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-28 10:38:32 -08:00
Jean-Baptiste Queru
44086a0039 Merge "The phone is crashing when unknown mime content is transferred." 2010-12-28 10:34:02 -08:00
Dianne Hackborn
6a7a699f3c am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:22:32 -08:00
Dianne Hackborn
0e6375a789 Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread 2010-12-23 14:19:03 -08:00
Dianne Hackborn
d3994f5183 Merge "frameworks/base: Fix to release references to previous live wallpaper" 2010-12-23 14:17:54 -08:00
Dianne Hackborn
37d273cbf0 Merge "frameworks/base: Fix to release references in ActivityManagerService" 2010-12-23 14:14:38 -08:00
Jeff Brown
f71751848b am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
  Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 12:43:48 -08:00
Jeff Brown
37cc46a0b4 Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread 2010-12-23 12:41:59 -08:00
Dianne Hackborn
6314ef2b8a am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
947d92c963 Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread 2010-12-22 18:34:40 -08:00
Jeff Brown
e7a0d2beea Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Bug: 3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
2010-12-22 16:00:21 -08:00
Dianne Hackborn
b6e30edf0c am 3b10aea5: Merge "Improve performance of WindowState.toString()"
* commit '3b10aea50c1044ff33d02727829c47c061f6e1c8':
  Improve performance of WindowState.toString()
2010-12-22 14:56:50 -08:00
James Dong
e5a94699e1 am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:40:57 -08:00
James Dong
7bc0c0a8b7 Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread 2010-12-22 12:38:11 -08:00
Mattias Petersson
de0fd15bdc am 1622eee2: Improve performance of WindowState.toString()
* commit '1622eee2e48678b17a4668641957f09213f98905':
  Improve performance of WindowState.toString()
2010-12-22 11:25:32 -08:00
Dianne Hackborn
0ca8fbb1cc Merge "Improve performance of WindowState.toString()" 2010-12-22 11:21:21 -08:00
Jeff Hamilton
044c2f2606 am 3ce86481: Remove canBeFormatted().
* commit '3ce86481cbde92e2cb6fe3a46cbedd8b2a5c4b48':
  Remove canBeFormatted().
2010-12-22 09:42:16 -08:00
Pravat Dalbehera
d1dff8d4d4 Fix for writing empty strings to Parcel::writeString8()
If writeString8 is called with the following sequence:

 writeString8(String8(""));
 writeString8(String8("TempString"));

Then in the readString8, the 2nd String i.e. "TempString" is not read,
instead an empty string is read.

The bug comes because of the write call for String8("") where there are
no String bytes present. In the write Statement, an extra ‘\0’ is
written. During the Marshalling, Following bytes are written:

1        2         3        4       5   ...
0x0      0x0       0xB      ‘T’     ‘e’  ...

The readString8 function has a check that, if String length is 0, don’t
read anything. So the first byte is read as the length for the first
string. The second byte i.e. ‘\0’ is read as the length for the second
string and hence the second string becomes empty too.

Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
2010-12-22 12:57:31 +01:00
Hung-ying Tyan
aec78ca5a9 am e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
* commit 'e0bd2688ebc68402fb848efb5d307dba19c6a30c':
  Check if VoIP API is supported in SipManager.
2010-12-21 18:36:55 -08:00
Hung-ying Tyan
6777b7fea3 Merge "Check if VoIP API is supported in SipManager." into gingerbread 2010-12-21 18:34:15 -08:00
Robert Greenwalt
200af56501 am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '5d0fafe80752ad4e40fe0ec2bc06c43e669a0612':
  Be sure and report NO_CONNECTIVITY when needed.
2010-12-21 16:06:19 -08:00
Robert Greenwalt
374504c059 Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread 2010-12-21 16:02:13 -08:00
Dianne Hackborn
23579789de am 5261cea2: Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
* commit '5261cea2e0cd61801e102114039a19ab449b53fe':
  Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.
2010-12-21 13:33:06 -08:00
Dianne Hackborn
0c6568615a Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread 2010-12-21 13:27:15 -08:00
Jean-Baptiste Queru
864530d1c6 am 749c627f: Merge "Support for KSC5601 on SIM."
* commit '749c627fc0f30dd3db051f22f20b69a51dc19e59':
  Support for KSC5601 on SIM.
2010-12-21 12:05:04 -08:00
Jean-Baptiste Queru
decfba4df7 Merge "Support for KSC5601 on SIM." 2010-12-21 10:27:14 -08:00
Simon Wilson
19214876fb am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
* commit '0c8ad64d64b23e2bdd62bc217e327c7e0583784b':
  fix [3127755] Launcher is missing anti-aliasing
2010-12-20 14:11:46 -08:00
Simon Wilson
c6a0991635 Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread 2010-12-20 14:09:52 -08:00
Mike LeBeau
ee966f6ead am 12b82c8d: Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn\'t want to make it public then because it wasn\'t until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
* commit '12b82c8da7bc477e591b12d8b7e469a9ba6dd574':
  Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app.
2010-12-20 11:58:01 -08:00
Mike LeBeau
98cb0d3f0f Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread 2010-12-20 11:55:56 -08:00
Scott Main
76d4f2bb1b am 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
* commit '00410256a667866b0b9d12b513688d3894140b73':
  cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos
2010-12-20 11:30:35 -08:00