Kenny Root
95a6889312
OBB: use PBKDF2 for key generation.
...
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.
Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
Mike Lockwood
91a2e55166
Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
2010-10-13 05:46:15 -07:00
Justin Ho
137ef22cef
Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
2010-10-12 20:30:36 -07:00
Hung-ying Tyan
7daf32433a
Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
2010-10-12 19:44:17 -07:00
Nick Pelly
9bf9f7a444
Merge "Fix build." into gingerbread
2010-10-12 19:23:13 -07:00
Dianne Hackborn
f0908a156c
Merge "Fix issue #3089800 : adb shell am -W causes ActivityManager crash" into gingerbread
2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
1f5843c4d2
Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread
2010-10-12 19:02:46 -07:00
Justin Ho
c2dc99c3ca
Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
2010-10-12 17:38:44 -07:00
Hung-ying Tyan
3874b18c1d
Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
2010-10-12 17:33:27 -07:00
Adam Powell
308ddf283c
Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
6cd9eff46d
Merge "Fix auto connection priority handling." into gingerbread
2010-10-12 16:46:50 -07:00
Jeff Brown
5cbba469d9
Merge "Add text selection handles to preloaded drawables." into gingerbread
2010-10-12 16:08:59 -07:00
Adam Powell
4254081daf
Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
2010-10-12 15:00:30 -07:00
Irfan Sheriff
b7768f0fa5
Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
2010-10-12 14:55:52 -07:00
Joe Onorato
08f64b9e27
Merge changes I76513387,I335fb671 into gingerbread
...
* changes:
Remove dead code, and make the animation a setting.
turn off the electron beam
2010-10-12 14:43:24 -07:00
Wink Saville
e5865c7c4c
Merge "Remove some PII." into gingerbread
2010-10-12 14:17:00 -07:00
Mathias Agopian
59119e658a
turn off the electron beam
...
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
2010-10-12 14:16:11 -07:00
Dirk Dougherty
05a1326c74
Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
2010-10-12 14:16:05 -07:00
Leon Scroggins
3c8e66f9a4
Merge "Allow TextView to do its thing." into gingerbread
2010-10-12 10:24:48 -07:00
Brad Fitzpatrick
ced4db017b
Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
2010-10-12 08:09:55 -07:00
Jeff Brown
9b0ab927e1
Merge "Improve the input policy handling a bit." into gingerbread
2010-10-12 01:01:14 -07:00
Jeff Brown
a8ed856a8a
Improve the input policy handling a bit.
...
Fixed some issues with Monkeys turning off their own screens. Ook ook!
Added some more comments to explain what's going on.
Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
2010-10-12 00:16:14 -07:00
Jeff Brown
3d3429e631
Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
2010-10-11 20:22:02 -07:00
Hung-ying Tyan
e4081fec39
Merge "SipService: fix a missing switch-case break." into gingerbread
2010-10-11 20:02:05 -07:00
Dianne Hackborn
c8b3e251c4
Merge "Fix SD card mounting issues #3074555 and #3072332 " into gingerbread
2010-10-11 19:13:33 -07:00
Jeff Brown
316237d554
Fix a bug synthesizing cancelation events for motions.
...
Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
2010-10-11 18:22:53 -07:00
Kenny Root
abcb347783
Merge "Change to new binder implementation for OBB" into gingerbread
2010-10-11 17:40:53 -07:00
Kenny Root
758753c876
Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
2010-10-11 17:24:54 -07:00
Joe Onorato
aa162c39ac
Merge "Add animation for the status bar going away." into gingerbread
2010-10-11 16:37:41 -07:00
Jeff Brown
b6af9cc212
Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
2010-10-11 16:27:36 -07:00
Joe Onorato
05cd45cab6
Merge "Fix status bar flashing after orientation change" into gingerbread
2010-10-11 16:26:36 -07:00
Jeff Brown
1fe6dec097
Fix an event injection bug when the policy is bypassed.
...
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.
Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Kenny Root
86284d2965
Merge "Grant URI permissions to the MCS" into gingerbread
2010-10-11 15:49:30 -07:00
Joe Onorato
eaa166e233
Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
2010-10-11 15:19:47 -07:00
Scott Main
a2e686914d
am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
...
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread
* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:04:20 -07:00
Chris Tate
966ae9392d
Merge "Temporarily turn on backup/restore debug logs" into gingerbread
2010-10-11 14:42:00 -07:00
Mathias Agopian
20f29b4a2a
Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
2010-10-11 14:37:57 -07:00
Mathias Agopian
3c2c54c270
fix a bug where FLIP_H would do a 180 rotation
...
Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
2010-10-11 14:19:24 -07:00
Mathias Agopian
eea35e1e86
Merge "deliver invalidate messages AFTER other messages" into gingerbread
2010-10-11 14:15:04 -07:00
Mathias Agopian
7b0ba16688
deliver invalidate messages AFTER other messages
...
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.
Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
2010-10-11 14:11:15 -07:00
Joe Onorato
09ed308945
Merge "Don't throw when userActivity fails because of the permission check." into gingerbread
2010-10-11 13:52:34 -07:00
Brad Fitzpatrick
aefa57869c
Merge "On boot, advance time to at least 1970." into gingerbread
2010-10-11 13:00:51 -07:00
Mathias Agopian
7f5b5a8ebf
Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
2010-10-11 12:41:33 -07:00
Mathias Agopian
23a0920339
fix a bug where timeouts would only be handled when a message was delivered
...
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
2010-10-11 12:40:09 -07:00
Andreas Huber
5b25eff784
Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
2010-10-11 12:36:03 -07:00
Mike Lockwood
c9df3e82d1
Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
2010-10-11 11:56:47 -07:00
Brad Fitzpatrick
7669f03f89
Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
2010-10-11 11:56:40 -07:00
Xia Wang
e3e077d738
Merge "Add mock ril control commands and tests" into gingerbread
2010-10-11 10:28:20 -07:00
Mike Lockwood
29a4f07b7e
Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
2010-10-10 16:32:49 -07:00
Justin Ho
9cfdf64d46
Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
2010-10-10 16:30:01 -07:00
