Teng-Hui Zhu
6e5276cf00
am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a':
fix for pause when loading
2011-03-22 13:58:16 -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
Kenny Root
688b310016
Merge changes Ie62206f8,Ib44c2b9f,I72ddeeae,If7fb1ce8,I62e6cb80
...
* changes:
Add generic types and more cleanup
PackageManager: Remove unused methods and more debug flags
PackageManager: mark some ints final
PackageManager: get rid of Config.LOG[DV]
Reorganize imports for PackageManagerService
2011-03-22 13:40:40 -07:00
Eric Fischer
765ae04f61
Import revised translations. DO NOT MERGE
...
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
2011-03-22 13:38:10 -07:00
Carl Shapiro
a00228dd04
Merge "Include strings.h for the strcasecmp prototype."
2011-03-22 13:37:59 -07:00
Andreas Huber
c8e14bf5d5
Merge "Delay signaling the end of audio playback until all frames have actually played."
2011-03-22 13:19:41 -07:00
Andreas Huber
4dc482daac
Delay signaling the end of audio playback until all frames have actually played.
...
Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10
related-to-bug: 3404000
2011-03-22 13:18:09 -07:00
Dianne Hackborn
2e28aa8905
am b6955be9: am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
...
* commit 'b6955be94a065f34275cc20161664871bd286f75':
Now have a final API 12.
2011-03-22 13:08:01 -07:00
Dianne Hackborn
b6955be94a
am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
...
* commit 'b382a0543938e3161a26615e03d0929ba75ea705':
Now have a final API 12.
2011-03-22 13:04:56 -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
Kenny Root
60f7ad8a8b
Add generic types and more cleanup
...
Removing some unused methods, adding generics where possible to avoid
future mistakes, and just more cleanups of warnings.
Change-Id: Ie62206f87dc19544b9dc039faa0159fc46ebc259
2011-03-22 12:55:31 -07:00
Kenny Root
4dfe6ff609
PackageManager: Remove unused methods and more debug flags
...
Change-Id: Ib44c2b9f3bf8f8ccf6b79771aee7481bd6a0d1e3
2011-03-22 12:49:17 -07:00
Kenny Root
62cc69017a
PackageManager: mark some ints final
...
Change-Id: I72ddeeae6bcd5df291b1c96020a0eca3e6552e41
2011-03-22 12:49:17 -07:00
Kenny Root
9718cf5e58
PackageManager: get rid of Config.LOG[DV]
...
Change-Id: If7fb1ce80dd36afb980f04687579580992c27f64
2011-03-22 12:49:16 -07:00
Kenny Root
2798942bc4
Reorganize imports for PackageManagerService
...
Change-Id: I62e6cb8088086a9f5c3983145a08b44b782693e4
2011-03-22 12:49:16 -07:00
James Dong
3c111d7815
Merge "Fix AAC encoder test util and remove files that are not needed"
2011-03-22 12:40:40 -07:00
James Dong
1056ec04cb
Merge "Fix AMRWB test util and remove useless files"
2011-03-22 12:40:35 -07:00
Kenny Root
7dca6f1b9c
Merge "Remove unused items in setInstallerPackageName"
2011-03-22 12:25:28 -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
35c654c3f5
am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
...
* commit '8e0f2d71a1d2353228ba04562c8189f4904a11d1':
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:54:44 -07:00
shailendra
8e0f2d71a1
am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
...
* commit 'b819dcd49ddd4be8f102c99576bb42cd088caf1a':
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:52:25 -07:00
Carl Shapiro
39ad826d2e
Include strings.h for the strcasecmp prototype.
...
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
2011-03-22 11:51:57 -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
repo sync
9ab66ff42f
resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp
...
Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c
2011-03-22 11:47:39 -07:00
Gloria Wang
66044c1792
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
...
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:43:09 -07:00
Andreas Huber
e50b799dc2
am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
...
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 11:42:51 -07:00
Teng-Hui Zhu
fdef2cb760
am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1
...
* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
Fix a crash
2011-03-22 11:42:37 -07:00
Yu Shan Emily Lau
8b17346a43
am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
...
* commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3':
Add the mem logging into test utility. Bug# 4108259
2011-03-22 11:42:26 -07:00
Gloria Wang
0043a76c78
am 97cd837e: (-s ours) am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
...
* commit '97cd837ec1e0eb87fb2a8a80a9789868fb5fecc7':
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
2011-03-22 11:42:23 -07:00
Justin Ho
28dcbdcc15
am 263fb828: am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
...
* commit '263fb8285c79a37d3c9dbd0f70d307b92f1ed8fc':
Fixing list selector theme Bug: 4147203
2011-03-22 11:42:20 -07:00
Andreas Huber
dce4a0f0d5
am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away.
...
* commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7':
If nothing is to be copied, return right away.
2011-03-22 11:42:08 -07:00
Gloria Wang
fc4c13be8c
am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
...
* commit '012401774f4aac29ad8cf8e32f36c4a521842767':
Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:08:38 -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
Adam Powell
37f421c594
Merge "Fix bug 3175131 - listviews don't highlight properly"
2011-03-22 10:48:52 -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
71ba7d34bc
am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
...
* commit '3da107288d5ae112073875ac10317def3c299818':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 08:55:51 -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
Adam Powell
becb0be2bb
Fix bug 3175131 - listviews don't highlight properly
...
Fix up selector drawable state when we resurrect a selection.
Change-Id: Id883c8b416207a50951ec2852826b1eee17bc50c
2011-03-22 00:21:07 -07:00
James Dong
bc40f9d27e
Fix AMRWB test util and remove useless files
...
Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
2011-03-21 21:59:32 -07:00
Chia-chi Yeh
40e1bdb7ce
Merge "Include strings.h instead of string.h for the strcasecmp prototype."
2011-03-21 21:49:29 -07:00
James Dong
9cd4844819
Fix AAC encoder test util and remove files that are not needed
...
Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
2011-03-21 20:55:06 -07:00
Carl Shapiro
06a42db7c5
Include strings.h for the strcasecmp prototype.
...
Change-Id: I0659ce2186547274e58f8b2027e16d3e45189353
2011-03-21 20:26:25 -07:00
Carl Shapiro
3f9e08973f
Include strings.h instead of string.h for the strcasecmp prototype.
...
Change-Id: I6b0ddc2408c30851edcffb36f1bc74245403ffc7
2011-03-21 20:21:40 -07:00