drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,115 Commits 1 Branch 0 Tags
Commit Graph

26115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
3b1abba6bb 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
Leon Scroggins
dfc07279fc Line up WebTextView text with the page. 
Bug:3085564

Requires a change to external/webkit:
https://android-git.corp.google.com/g/#change,73568

Change-Id: I4c3fa1314bdac39cc071f583a418c433ea897de8
 2010-10-13 10:08:59 -04:00
Mike Lockwood
c792c2e9ed Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 2010-10-13 05:46:15 -07:00
Justin Ho
e03471e12f Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
33bae9b826 Updated lockscreen asset (Hiroshi), new menu background 
Change-Id: Ibe8c535bcdd35668c7aae87b6e8c1ef622f3e148
 2010-10-12 20:19:14 -07:00
Hung-ying Tyan
f1b1eec9de Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Hung-ying Tyan
d6fc979edb SipService: mScreenOn is flipped to wrong value. 
http://b/issue?id=3077454

Change-Id: I23b6f70730074689b939e449c2c202ce8ffb586f
 2010-10-13 10:25:07 +08:00
Nick Pelly
ab39f1ef13 Merge "Fix build." into gingerbread 2010-10-12 19:23:13 -07:00
Nick Pelly
d197f59ec9 Fix build. 
I removed these by mistake, and incremental build failed to pick the failure.

Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
 2010-10-12 19:21:07 -07:00
Justin Ho
cdbd8ab789 Updated popup_ 9 patches and removing text_select_handle (hdpi) 
Change-Id: I101a4ad12e7e88621073f860e39dcb16730d7722
 2010-10-12 19:14:10 -07:00
Dianne Hackborn
259c849989 Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
64f4280313 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Dianne Hackborn
ba0492d5ed Fix issue #3089800: adb shell am -W causes ActivityManager crash 
Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa
 2010-10-12 19:01:46 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2. 
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-12 18:37:26 -07:00
Justin Ho
45738f6700 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
907f6f1d7d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -07:00
Justin Ho
a78c85482e Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi) 
Change-Id: Ic7089d0277582506b745cfa73d1a7bb311c600a7
 2010-10-12 17:29:06 -07:00
Adam Powell
c417612a1a Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
adbda6f094 Bluez doesn't handle disconnect while connecting well. 
Defer the message.

Bug: 3076404
Change-Id: Id62e1008346f492a85e714240a832a061def1786
 2010-10-12 16:58:06 -07:00
Jaikumar Ganesh
1bc3a407ce Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jaikumar Ganesh
bcf5cf47ed Fix auto connection priority handling. 
Bug: 3027023
1. user is connected to a headset. Headset is turned off.
2. User connects to another device. The priority of the first
   headset must be set to ON. We only have 1 device set at AUTO_CONNECT
   priority.

1. A remote headset sends an incoming connection. Don't set
   AUTO_CONNECT till its gets connected.
2. For outgoing connections, set it to AUTO_CONNECT in Connecting state
   since the user initated this connection.

Change-Id: Iaa211bf22b1fd99850875f7eda686c47142173ba
 2010-10-12 16:42:45 -07:00
Jeff Brown
fa3d9557c8 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Adam Powell
d7bd2eb032 Fix bug 3083631 - Links no longer get tapped during scale gestures 
Change-Id: I57bf740c5063f30d763fc720a3ad77edff20f867
 2010-10-12 15:56:31 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables. 
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
 2010-10-12 15:22:13 -07:00
Andy Stadler
8e2be267f5 Add versionCode and versionName to dumpsys packages 
bug: 3090491
Change-Id: If116baaeb83bd282c5c5534fde6248f19830a71c
 2010-10-12 15:05:06 -07:00
Adam Powell
fb6431c029 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
e22eb863dc Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -07:00
Adam Powell
8c8293bc4d Fix bug 3064135 - do not allow text handles on TextViews in sub windows. 
Change-Id: I35db64d0a5c92c8ad184b36d243e45c91d4ac46e
 2010-10-12 14:45:55 -07:00
Joe Onorato
ba79909860 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
a310031438 Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting. 
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
 2010-10-12 14:16:11 -07:00
Mathias Agopian
aab758e879 turn off the electron beam 
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
 2010-10-12 14:16:11 -07:00
Dirk Dougherty
354954a01c Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
Wink Saville
a42880749b Remove some PII. 
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
 2010-10-12 12:36:38 -07:00
John Wang
844a6b3cca Turn off additional debug. 
Bug:3038245
Change-Id: If3c894511b4bbfd0d3e95b51aeca299edbbcf55d
 2010-10-12 11:32:24 -07:00
Irfan Sheriff
bf844308a2 fix start driver for corner cases DO NOT MERGE 
- Force a start when in RUN_STATE_STOPPING since there
could have a stop driver in that state
- When a driver started event is received is received
from the supplicant, force a reconnect since we could
have out of an intermediate stop event that would have
forced the run state to STOPPED

Bug: 3087621
Change-Id: I3652747a267a3da8349a9fd5c4065d3837a0c545
 2010-10-12 11:30:22 -07:00
Leon Scroggins
f348502c70 Merge "Allow TextView to do its thing." into gingerbread 2010-10-12 10:24:48 -07:00
Brad Fitzpatrick
9facd2d084 Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 2010-10-12 08:09:55 -07:00
Leon Scroggins
23cb86a47d Allow TextView to do its thing. 
Bug:3085639

Call super.onTouchEvent for ACTION_UP and ACTION_CANCEL.
This removes the old selection as appropriate.

Bug:3085587

Make the cursor visible so that the insertion handle
appears when tapping on the field.

Change-Id: If5ea6219de9ca351667021743b2e63edc6c47250
 2010-10-12 09:52:56 -04:00
Jeff Brown
03aa28fb36 Merge "Improve the input policy handling a bit." into gingerbread 2010-10-12 01:01:14 -07:00
Hung-ying Tyan
ebc886c857 Fix SipSessionGroup from throwing ConcurrentModificationException 
http://b/issue?id=3087256

Change-Id: I67df64105db7c1295649f1f3ce77f99025ce3d44
 2010-10-12 15:41:11 +08:00
Jeff Brown
3122e4488a 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
Chung-yih Wang
4367ab00ed Set the wifi-only for SIP service as the default config. 
Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e
bug-id: http://b/3068006
 2010-10-12 12:39:50 +08:00
Hung-ying Tyan
f5201ab71f Keep original phone number in SipConnection. 
In case it's a PSTN number carried by an Internet call, the phone app can still
get the original phone number from Connection.getAddress() instead of getting a
SIP URI.

http://b/issue?id=3085996

Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
 2010-10-12 11:34:01 +08:00
Jeff Brown
a28d5aff54 Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread 2010-10-11 20:22:02 -07:00
Hung-ying Tyan
ece7e11b37 Merge "SipService: fix a missing switch-case break." into gingerbread 2010-10-11 20:02:05 -07:00
Hung-ying Tyan
685b61b711 SipService: fix a missing switch-case break. 
Change-Id: I638eecd8000293d4cb37b3595c02ca33df4924eb
 2010-10-12 10:46:29 +08:00
Dianne Hackborn
ffbc4b948d Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread 2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91 Fix SD card mounting issues #3074555 and #3072332 
Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019
3074555: Kill "Shared storage safe to remove" notification
3072332: "blank shared storage" notification doesn't go anywhere
 2010-10-11 19:12:21 -07:00
Mike Lockwood
f7b7330e71 GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue 
Change-Id: Ic934c478f0eb6c6d368caaf41aec8235d329ef34
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-11 21:27:06 -04:00