68795 Commits

Author SHA1 Message Date
James Dong
52cb1e5988 Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes
o added missing javadoc comment for some public fields
o added checks for arguments
o DrmSupportInfo should have not been exposed as public.
  A default package access modifier appears to be more proper but we may
  not be able to change the modifier.

Change-Id: I5b284c17219c5121f241ee2934fb3e859ce7c827
2012-03-01 12:23:46 -08:00
Romain Guy
d8f45c16a8 Merge "Small tweak to Canvas.drawPath() GL implementation" 2012-03-01 12:11:59 -08:00
Romain Guy
dd7c8e4c68 Small tweak to Canvas.drawPath() GL implementation
Change-Id: I1d668a912996e1267bcf2127058888e489a2d9b3
2012-03-01 12:08:38 -08:00
Teng-Hui Zhu
148c5dadf4 Merge "Clean up Surface Texture on Java side" 2012-03-01 11:32:59 -08:00
Andreas Huber
3d3864fff4 Instead of hardcoding OMX component names in our code, support
a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
2012-03-01 11:30:10 -08:00
Teng-Hui Zhu
fdd646b2b1 Clean up Surface Texture on Java side
bug:6079959

Change-Id: I5869d4fe4dc6eb12a117937b95a8277897d71ebb
2012-03-01 11:18:15 -08:00
John Wang
393acacd61 Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java" 2012-03-01 10:52:47 -08:00
The Android Open Source Project
efa4943952 am 4f306bec: Reconcile with ics-mr1-release
* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':
2012-03-01 10:46:52 -08:00
The Android Open Source Project
4f306becef Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
2012-03-01 10:40:13 -08:00
Sangcheol Lee
859b7ef8f0 [maguro] Add Cheers' MCCMNC in SIMRecords.java
[issue 5963659]
Result:
There is no APN information for Cheers

Expected Result:
Mobile internet APN name for Cheers should be displayed

Change-Id: Iab29cfbd06ab15559048ced23136abae1fcab8f3
2012-03-01 10:29:51 -08:00
Wink Saville
85c738f6ba Merge "If no NITZ information use Country Code to set TimeZone." 2012-03-01 10:28:56 -08:00
Wink Saville
a27421a306 If no NITZ information use Country Code to set TimeZone.
This is not perfect and only works if the CC is known via
the GSM radio and is only accurate if there is one time zone
per country. This does nothing to resolve time zone problems
for wifi only devices.

So this is a partial fix for bug 2896745

Bug: 2896745
Change-Id: I78f013836c4e4870b8b1016a8312f5adbe0d31c9
2012-03-01 10:25:48 -08:00
Jeff Brown
672f74bbe2 Merge "Improve documentation of SQLite debugging options." 2012-03-01 10:23:51 -08:00
Jeff Brown
638eff7ee1 Improve documentation of SQLite debugging options.
Change-Id: Id3b4d9e4e9dd62d2a1e6188477225af7717788f4
2012-03-01 10:21:29 -08:00
Eric Laurent
c95cd6bca0 Merge "renamed audio policy output flag." 2012-03-01 10:17:21 -08:00
The Android Open Source Project
956abc304f am f8e58c8b: Reconcile with ics-mr1-release
* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
2012-03-01 10:14:27 -08:00
The Android Open Source Project
f8e58c8b4e Reconcile with ics-mr1-release
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
2012-03-01 10:11:48 -08:00
Alex Sakhartchouk
541b492d49 Merge "Allocation sampling api prototypes." 2012-03-01 09:43:43 -08:00
Eric Laurent
45d8c80dea renamed audio policy output flag.
Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE
which is more appropriate.

Change-Id: Ia14d60397df0f2dcd9bea0186400a09da35bc104
2012-03-01 09:43:32 -08:00
Roman Nurik
57a7b010f0 am 62b4e4a8: am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '62b4e4a83ea949537ca4bb1f56074d63a17bf87a':
2012-03-01 09:26:24 -08:00
Roman Nurik
ae9029938a am b96ad49a: am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit 'b96ad49a3a898b741f7c4d6854e599116546e2ac':
  docs: Android Design downloads section, linkable H2s.
2012-03-01 09:08:33 -08:00
Robert Greenwalt
10bcb6fbb1 Merge "Don't forget to turn off mobile_dun" 2012-03-01 08:13:24 -08:00
Android Git Automerger
55fbbce495 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-01 07:35:22 -08:00
Steve Block
8a7259bdc2 Prevent a 'TODO' from appearing in the JavaDoc
Change-Id: I3fdd46263cea413d519c56f4bd0e9d873f6fbfa6
2012-03-01 11:25:27 +00:00
satok
592c85cd6c Merge "Handle sentence level spell checking hidden APIs" 2012-03-01 00:25:03 -08:00
satok
8898358bfd Handle sentence level spell checking hidden APIs
Change-Id:  Ia91f1771c0b8ef458dd5b023f4c372cc36a15657
2012-03-01 15:56:58 +09:00
Wu-cheng Li
e78c8ba82a Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren." 2012-02-29 22:49:10 -08:00
Jeff Brown
9a4a1a5414 Merge "Externalize more SQLite configuration options." 2012-02-29 21:29:22 -08:00
Jeff Brown
5936ff097e Externalize more SQLite configuration options.
Moved more configuration into config.xml so we can tweak settings
like the default journal mode, WAL auto-checkpoint interval and
so on.

This change itself should not introduce any functional differences.

Change-Id: Id6c95fa25b116ce47e8ae49cd8a80d52b1c0dd80
2012-02-29 21:03:20 -08:00
Mathias Agopian
09264d5248 add more tracing for buffer allocation
Change-Id: I8408850d0625985992ef2e2cd0c9f300b1fca293
2012-02-29 20:47:20 -08:00
Irfan Sheriff
43d8a95fa8 Merge "Improve Wi-Fi hand-off" 2012-02-29 19:33:06 -08:00
Romain Guy
7084e75282 Merge "Full implementation of Canvas.drawPath()" 2012-02-29 19:16:15 -08:00
Romain Guy
9777173eb6 Full implementation of Canvas.drawPath()
Change-Id: I23223b89770a0cd2b4762365bead9bfddb094290
2012-02-29 19:14:37 -08:00
Yu Shan Emily Lau
da0c4a3ea6 am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'd12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:04:11 -08:00
Yu Shan Emily Lau
353b61a87d am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '0ddfe24a19882bb355313b6c5c14dcb0c6608365':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:03:40 -08:00
Yu Shan Emily Lau
0ddfe24a19 am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
d12347b2b4 am eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
2012-02-29 19:00:00 -08:00
Fabrice Di Meglio
81c4350a89 Merge "Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated" 2012-02-29 18:45:54 -08:00
Fabrice Di Meglio
34a126e51a Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated
- take care of single line case too

Change-Id: I73c3dcb96f22241b35d7cbaf43cd9bd46a4abcaa
2012-02-29 18:43:14 -08:00
Irfan Sheriff
07573b3249 Improve Wi-Fi hand-off
When Wi-fi connects at L2 layer, the beacons reach and the device
can maintain a connection to the access point, but the application
connectivity can be flaky (due to bigger packet size exchange).

We now use Watchdog to monitor the quality of the last hop on
Wi-Fi using signal strength and ARP connectivity as indicators
to decide if the link is good enough to switch to Wi-Fi as the uplink.

ARP pings are useful for link validation but can still get through
when the application traffic fails to go through and thus not best indicator
real packet loss since they are tiny packets (28 bytes) and have
much low chance of packet corruption than the regular data
packets.

Signal strength and ARP used together ends up working well in tests.
The goal is to switch to Wi-Fi after validating ARP transfer
and RSSI and then switching out of Wi-Fi when we hit a low
signal strength threshold and waiting until the signal strength
improves and validating ARP transfer.

Change-Id: Ica593291ec7772da892f03cf45b649635b730c47
2012-02-29 17:33:36 -08:00
Gilles Debunne
161d9cf954 Merge "Invalidate text display list on scroll" 2012-02-29 17:32:20 -08:00
Michael Jurka
fa73c1fd3e Merge "Fix alpha when swiping recents on tablets" 2012-02-29 17:30:05 -08:00
Jeff Brown
0e689abaec Merge "Don't throw if sqlite3_finalize returns an error." 2012-02-29 17:06:23 -08:00
Jeff Brown
96ba76fbde Merge "Refactor SQLiteOpenHelper." 2012-02-29 17:06:08 -08:00
Jeff Brown
958cbbab6a Don't throw if sqlite3_finalize returns an error.
Change-Id: Ibcc772ad5343dd241ed9dc492e4d838e1ab962d4
2012-02-29 17:02:04 -08:00
Jeff Brown
559d0645ac Refactor SQLiteOpenHelper.
Combine the code for opening readable and writable databases.
This improves the handling of the case where a database cannot
be opened because it cannot be upgraded.  Previously we would
open the database twice: first read-write, then read-only, each
time failing due to the version check.  Now only open it once.

Removed the goofy locking logic related to upgrading a read-only
database to read-write.  We now do it in place by reopening the
necessary connections in the connection pool.

Change-Id: I6deca3fb90e43f4ccb944d4715307fd6fc3e1383
2012-02-29 17:02:04 -08:00
Michael Jurka
4eaa983f25 Fix alpha when swiping recents on tablets
When you swipe to dismiss a recent item on a
tablet, fade the item to 0 alpha

Also, create common interface for Recents-specific
methods for Recents[Horizontal/Vertical]ScrollView

Bug: 5953654

Change-Id: I0a72b49b3cfae0607b42dbf8f6d4da9898d7e491
2012-02-29 16:49:01 -08:00
Alex Sakhartchouk
96804ad6bc Allocation sampling api prototypes.
Change-Id: Ia11c6a107ea49ad6f40cfd220c537376a18c3b62
2012-02-29 16:43:24 -08:00
Andrew Hsieh
502695d528 Merge "Fixed several 64-bit porting issues" 2012-02-29 16:41:55 -08:00
James Dong
71dea373f4 Merge "Added permission check for all sensitive drm API calls" 2012-02-29 16:32:10 -08:00