64198 Commits

Author SHA1 Message Date
Gilles Debunne
89f2e8a099 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
Kenny Root
8030bfd9c8 am c2fc52dc: Merge "Add aapt support for implicitly-granted permissions"
* commit 'c2fc52dc9ce8728bcd1c2b4d82ee573fa7f5049b':
  Add aapt support for implicitly-granted permissions
2011-12-08 09:04:27 -08:00
Kenny Root
c2fc52dc9c Merge "Add aapt support for implicitly-granted permissions" 2011-12-08 09:02:51 -08:00
Kenny Root
063a44e541 Add aapt support for implicitly-granted permissions
Bug: 2363582
Bug: 2877343
Change-Id: Iff7b496fb845e45fe1be2317089a96f7d63ed223
2011-12-08 08:46:34 -08:00
The Android Automerger
0d57c8aeb4 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:00:35 -08:00
Jeff Tinker
a5038d169f am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-08 00:16:22 -08:00
Jeff Tinker
a693a4b555 Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
03e634270d am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.
2011-12-07 23:31:03 -08:00
Jeff Brown
944c985b41 am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
2011-12-07 23:31:02 -08:00
Jeff Brown
8e0ecbfc97 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
e0e9fd981c Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
James Dong
e9708f7637 am 1321bc1f: Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0."
* commit '1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1':
  Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0.
2011-12-07 23:07:16 -08:00
James Dong
1321bc1fa3 Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0." 2011-12-07 23:05:03 -08:00
Jeff Brown
7bedf24490 Shortcut keys should be handled on down, not up.
Bug: 5720360
Change-Id: I3afc278e576ea992c76f024c8b6bad14b214239c
2011-12-07 21:37:19 -08:00
Jeff Brown
68b909d8ac Fix system hotkey handling.
Fixed a problem where the key up for the ALT or META key was not
delivered to the task switcher dialog because it was deemed
to be inconsistent with the window's observed state.  Consequently
the dialog would not be dismissed when the key was released.

Moved global hotkey handling for META+* shortcuts and ALT/META-TAB
into the window manager policy's interceptKeyBeforeDispatching
method.  This change prevents applications from hijacking these
keys.

The original idea was that these shortcuts would be handled only
if the application did not handle them itself.  That way certain
applications, such as remote desktop tools, could deliberately
override some of these less important system shortcuts.
Unfortunately, that does make the behavior inconsistent across
applications.  What's more, bugs in the onKeyDown handler of
applications can cause the shortcuts to not work at all, for
no good reason.

Perhaps we can add an opt-in feature later to enable specific
applications to repurpose these keys when it makes sense.

Bug: 5720358
Change-Id: I22bf17606d12dbea6549c60d20763e6608576cf7
2011-12-07 21:37:16 -08:00
Dave Burke
69072470a2 am 9650b018: am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1
* commit '9650b018e3b1ed42de9b48f3c0eaf4e04733f065':
  Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:46:02 -08:00
Dave Burke
9650b018e3 am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1
* commit 'e118c1de0037e6732b66b9f52903567caa961c31':
  Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:43:18 -08:00
Dave Burke
e118c1de00 am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:41:27 -08:00
Dave Burke
ef8913c035 Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -08:00
Jeff Tinker
d0d19db1ca Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
2011-12-07 20:23:20 -08:00
Alex Sakhartchouk
e7a5b5aa9a Making UI a bit more responsive.
Change-Id: I92875e9304675fcda978a49c1447e22911e2a839
2011-12-07 20:22:08 -08:00
Wink Saville
5fd645656e am a78a08b1: am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit 'a78a08b103efc0e2068678b0a05b547fa433739b':
  When the SIM_READY set current preferred network type.
2011-12-07 20:21:54 -08:00
Wink Saville
a78a08b103 am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit 'ea75b82221dc9086cf97a791aed3b79ff3731bba':
  When the SIM_READY set current preferred network type.
2011-12-07 20:19:50 -08:00
Wink Saville
ea75b82221 am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit '234a5ef66275087aff9cfb94adc7608e9f358f11':
  When the SIM_READY set current preferred network type.
2011-12-07 20:18:06 -08:00
Wink Saville
234a5ef662 Merge "When the SIM_READY set current preferred network type." into ics-mr1 2011-12-07 20:15:45 -08:00
Wink Saville
975d348c18 When the SIM_READY set current preferred network type.
This looks to fix a problem where the nv_data.bin file
file gets corrupted. When greping a radio log for "md5" if something
like following is seen:

  RIL(s)  : load_md5_state: MD5 state 1
  RIL(s)  : check_md5:
  RIL(s)  : compute_md5: path /efs/nv_data.bin
  RIL(s)  : check_md5: MD5 fail. orignal md5 '628647a8e5c6cac2d586199417c0103c' computed md5 '58a635cbaf5fe4ffb2797aeaa2b32709' (rild)
  RIL(s)  : check_md5:
  RIL(s)  : compute_md5: path /efs/.nv_data.bak

It means that corruption was detected and a back version was used
which is ok. Apparently that backup version can have the default
network type revert to 2G only thus causing the symptoms reported
in b/5695729 where after taking an OTA 2G becomes the default.

By calling setCurrentPreferredNetworkType when the sim is ready we
can reset the the network type to 3G.

Note: I also tried calling setCurrentPreferredNetworkType in
EVENT_RADIO_AVAILABLE but that didn't work and we would see
the response to setPreferredNetworkType failing as the ril wasn't ready.

  RILJ    : setCurrentPreferredNetworkType: 0
  RILJ    : [0004]> REQUEST_SET_PREFERRED_NETWORK_TYPE : 0
  RILJ    : [0004]< REQUEST_SET_PREFERRED_NETWORK_TYPE error: com.android.internal.telephony.CommandException: RADIO_NOT_AVAILABLE


Bug: 5695729
Change-Id: Ibbd29cda0b201a8c08f4dcfa5cec211611e1d599
2011-12-07 20:07:54 -08:00
Jaikumar Ganesh
dc9a891d1e am 07c2c9f0: am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit '07c2c9f03b9b3bdca89f4960380b6b714ea6b8b0':
  Reduce likelihood of crash in state machine.
2011-12-07 19:55:46 -08:00
Jaikumar Ganesh
07c2c9f03b am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit '38342c9d858d8b021bc5c616cfe6c0ab9f359b2b':
  Reduce likelihood of crash in state machine.
2011-12-07 19:53:47 -08:00
Jaikumar Ganesh
38342c9d85 am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.
2011-12-07 19:52:11 -08:00
Jaikumar Ganesh
d426c338a6 Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
Svetoslav Ganov
234484a9fb NumberPicker getting stuck if scroll wheel not wrapable.
1. If the number picker was not wrapping the selector wheel
   it was incorrectly initializing the fling scroller and
   the error was proportional to the difference of the
   current value and the max size. As a result if the number
   picker gets stuck for a very long time.

2. The alpha of the selector wheel paint was not reset on
   every subsequent fling so if the wheel was fading out
   and a new fling is performed the selector wheel is
   dimmed during the fling, rather bright.

bug:5728363

Change-Id: Ia90a6af86f162bda1b28f43f7ba7e4a9f5051b78
2011-12-07 19:35:15 -08:00
Romain Guy
c7ee3cab56 Remove dangerous and useless optimization
Bug #5525888

Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea
2011-12-07 19:10:04 -08:00
John Wang
92ac905c62 am 10fd37dd: am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit '10fd37dd9e502d40057abb8ab85614552b78b7ad':
  Correct the dialing number of structured MMI.
2011-12-07 19:06:32 -08:00
Gilles Debunne
a1ea133c8c am b69c8cab: am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit 'b69c8cab56cffb4799e6701e3a52da9242b0569d':
  Insert into user dict with the correct locale
2011-12-07 19:06:30 -08:00
Adam Powell
7e609698bb am 24365799: resolved conflicts for merge of db81dc72 to master
* commit '243657993c0280771e07a3367d1a7ed45dbfe15f':
  Raise touch slop value from previous experiment
2011-12-07 19:04:15 -08:00
John Wang
10fd37dd9e am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit '2de0b07f47c3561b6e550ff630901d2776a437e3':
  Correct the dialing number of structured MMI.
2011-12-07 19:03:42 -08:00
Gilles Debunne
b69c8cab56 am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit '0235016acb241556f24689e3d818db6973b5ad4f':
  Insert into user dict with the correct locale
2011-12-07 19:03:30 -08:00
John Wang
2de0b07f47 am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
2011-12-07 18:51:11 -08:00
John Wang
ca0a68cc8a Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
0235016acb am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale
2011-12-07 18:42:04 -08:00
Gilles Debunne
2df13452e0 Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Adam Powell
243657993c resolved conflicts for merge of db81dc72 to master
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
2011-12-07 18:18:58 -08:00
Jaikumar Ganesh
a544d467f2 Reduce likelihood of crash in state machine.
Reduce likelihood of crash when state machine has quit and someone
sends a message using one of the public functions.

Bug: 5724844

Change-Id: I6582a1d19113e6ed545c8ab20adb0a414d8784a7
2011-12-07 18:07:29 -08:00
Adam Powell
db81dc7233 am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1
* commit 'cf6a6522fdbce05896d3a551f7cd6243857ceced':
  Raise touch slop value from previous experiment
2011-12-07 17:57:08 -08:00
Adam Powell
cf6a6522fd Merge "Raise touch slop value from previous experiment" into ics-mr1 2011-12-07 17:55:35 -08:00
Adam Powell
6720a87ad1 Raise touch slop value from previous experiment
Change-Id: I7681c401803643f309fd988824602169a830de29
2011-12-07 17:53:46 -08:00
Daniel Sandler
fa0a5c84d3 am 1ba22cc3: am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c':
  Improve handling of small largeIcons in tablet ticker.
2011-12-07 17:45:52 -08:00
Daniel Sandler
1ba22cc33d am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit 'b490d8d6214114391622b4302ca2f5f39b2166c6':
  Improve handling of small largeIcons in tablet ticker.
2011-12-07 17:43:39 -08:00
Daniel Sandler
b490d8d621 am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '29933fb26a4294a9bd30f9227809e28949252833':
  Improve handling of small largeIcons in tablet ticker.
2011-12-07 17:42:07 -08:00
Daniel Sandler
29933fb26a Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 2011-12-07 17:40:07 -08:00