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

47304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
0b6d044567 am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
 2011-03-22 21:37:48 -07:00
Robert Greenwalt
ac70fb8be6 Merge "Fix adding of default route." into honeycomb-mr1 2011-03-22 21:36:04 -07:00
Eric Rowe
22e21da663 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Robert Greenwalt
edcb4f9d56 Fix adding of default route. 
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway.  Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.

This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).

Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route.  This allows the default add to succeed.

bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
 2011-03-22 18:47:42 -07:00
Wink Saville
a97f49c02b Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -07:00
Wink Saville
5d612f1601 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Robert Greenwalt
8b84377f7d Remove unused onResetDone. 
Refactor things a bit.  Promoting GsmDataConnection's apn (ApnSetting) to DataConnection.
Use DataConnection's resetSynchronously rather than tampering with it from another thread.

bug:3486066

Change-Id: I2a7f7368f73c7d5c81e821976efafd56aca7aa69
 2011-03-22 15:13:34 -07:00
Eric Fischer
b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -07:00
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
2c6f2816d7 am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
5039e6da1e Merge "fix for pause when loading" into honeycomb-mr1 2011-03-22 13:55:28 -07:00
Eric Fischer
765ae04f61 Import revised translations. DO NOT MERGE 
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
 2011-03-22 13:38:10 -07:00
Dianne Hackborn
b382a05439 am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1 
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
 2011-03-22 13:01:19 -07:00
Dianne Hackborn
8dcd664760 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
Teng-Hui Zhu
158fbdb29b fix for pause when loading 
bug:4148903

Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
 2011-03-22 12:02:11 -07:00
shailendra
b819dcd49d am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:50:15 -07:00
shailendra
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Gloria Wang
012401774f am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:06:43 -07:00
Gloria Wang
3cc797b9c4 Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 2011-03-22 11:04:32 -07:00
Dianne Hackborn
99ca5cc5c7 Now have a final API 12. 
Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
 2011-03-22 10:46:42 -07:00
Wink Saville
1d1a373f5c Tweak RIL.java debug. 
Changed the one use of DBG to RILJ_LOGD and make
RILJ_LOGV a STOPSHIP if true. I then use that to
output IMSI, IMEI and IMEISV to assist in initial
bring up of RIL's.

Change-Id: Ieb9d1120f76c89c130cbecb2992603fc6af71b96
 2011-03-22 09:15:26 -07:00
Andreas Huber
3da107288d am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
 2011-03-22 08:48:58 -07:00
Andreas Huber
453c0d5f16 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -07:00
Gloria Wang
c430394ed7 Add one more field in DecryptHandle to support bug 4126624 
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
 2011-03-21 19:08:18 -07:00
Teng-Hui Zhu
f2c44a79d9 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Yu Shan Emily Lau
112852b577 am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-21 18:00:32 -07:00
Gloria Wang
4f87a46e6f am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
 2011-03-21 18:00:30 -07:00
Justin Ho
6a21161095 am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Gloria Wang
7abedd0cde Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 2011-03-21 17:26:03 -07:00
Gloria Wang
ee4084bf06 do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. 
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
 2011-03-21 16:53:14 -07:00
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Andreas Huber
8505f2fe1e DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
 2011-03-21 16:45:25 -07:00
Andreas Huber
970d7dd95f am e2c32e9f: If nothing is to be copied, return right away. 
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
 2011-03-21 16:21:29 -07:00
Justin Ho
c16168091a Fixing list selector theme 
Bug: 4147203

Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
 2011-03-21 15:04:23 -07:00
Teng-Hui Zhu
f82e5a2c90 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Andreas Huber
e2c32e9f96 If nothing is to be copied, return right away. 
This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
 2011-03-21 14:16:03 -07:00
Teng-Hui Zhu
0b933c02dd Merge "Support loading image and paused image for inline video" into honeycomb-mr1 2011-03-21 14:01:10 -07:00
Justin Ho
38cf000a54 am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '5e35c4855a972960403a10811882ebded8945006':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:54:51 -07:00
Teng-Hui Zhu
265db32f31 Support loading image and paused image for inline video 
bug:4142131

Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
 2011-03-21 10:36:00 -07:00
Justin Ho
5e35c4855a Updated 3G and wifi traffic indicators 
Change-Id: I3bc61067d4c30e9cda6170e87552d93c2a084895
 2011-03-21 08:42:54 -07:00
Mike Lockwood
56063c8d62 am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:25:09 -07:00
Mike Lockwood
dd76dc0297 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
Mike Lockwood
1c0e543638 UsbService: Handle the case where a USB accessory connects as the device is booting 
Bug: 4129297

Change-Id: I8f9d085805fb598572f9b00952c3cd38cfab461b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-19 12:03:46 -04:00
Eric Rowe
2b1fb45fab Clean up BT stress tests. 
Make ConnectPanReceiver a child of ConnectProfileReceiver, check if a
profile proxy is null before trying to connect.  Change log output in
bluetooth.  Remove some oververbose parameters from test runner. Make
the setup for the tests more consistent (delete pairings, etc).

Most of this work has been done to facilitate the tests created for
trade federation.

Change-Id: I7350d308b5d09c2052e0a3f3308a69c564ba4d74
 2011-03-18 20:13:11 -07:00
Jamie Gennis
b368f4d85d am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
 2011-03-18 17:34:27 -07:00
Jamie Gennis
38caff230d Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00