73696 Commits

Author SHA1 Message Date
Alex Sakhartchouk
972ed5809c Merge "Moving libRS" 2012-03-28 15:08:56 -07:00
Alex Sakhartchouk
b43a1e5ddf Moving libRS
Change-Id: I1e42204e862585b9c2f7818b615890c60f08faf6
2012-03-28 14:18:15 -07:00
Colin Cross
c8947b3d79 Merge "Move services/powermanager from frameworks/base to frameworks/native" 2012-03-28 14:12:30 -07:00
Irfan Sheriff
8a34718d84 Merge "Control suspend optimizations from framework" 2012-03-28 14:12:11 -07:00
Colin Cross
4be0041630 Move services/powermanager from frameworks/base to frameworks/native
Move services/powermanager into frameworks/native so audioflinger can
use it.  Note that this is not the same as a PowerManagerService,
which is part of systemserver and handles turning the screen on and
off, etc.  This is just a binder interface to allow taking wakelocks.

Change-Id: I1142e6d9ddbb651cc19ac07d946fa24d8feed8a3
2012-03-28 13:57:51 -07:00
Anatol Pomazau
a003776821 Merge changes I7459b9e9,I9bc5573e
* changes:
  frameworks base Android.mk file changes
  Deleted the media, camera, drm related files since they are relocated
2012-03-28 12:21:13 -07:00
Gilles Debunne
59075643ac Merge "Handle non DynamicLayout in Editable draw method." 2012-03-28 11:11:48 -07:00
Gilles Debunne
ee9da04edc Merge "Moving focus on text should not create an Editor" 2012-03-28 11:05:43 -07:00
James Dong
ba4d043331 frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
2012-03-28 11:03:25 -07:00
James Dong
d927a1d996 Deleted the media, camera, drm related files since they are relocated
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
2012-03-28 10:42:44 -07:00
George Mount
f9c1f9935b Snap selection handles to text
Bug 6198286
 Webkit Change: I55604f3ec28586beaec5fd98a27c9f4b8a59a8a5

Change-Id: I3c51ed5f6988d58440badfbe8b076fd83d48ae2a
2012-03-28 07:10:34 -07:00
Steve Block
7de2ae2564 Merge "Remove superfluous code after removal of Android HTTP stack" 2012-03-28 05:18:57 -07:00
Jonathan Dixon
c53471cf4d Merge "Tidy up usage of URLUtil constants" 2012-03-28 03:56:29 -07:00
Jonathan Dixon
0fa72ef10e Tidy up usage of URLUtil constants
Several of these are duplicated; referring to a single source makes the code
paths using them easier to track down.
(also removing a spurious import)

Bug: 6237833

Change-Id: Ibdacc124c047e37c7f0ced9ecc6f26ae3e6b4326
2012-03-28 10:09:39 +01:00
Kenny Root
fb32ab903a Update Wifi tests
Wifi tests used old WifiConfiguration values. This updates it to the new
values.

Change-Id: I14498aebba50f906181fa377b84855eae3d046fc
2012-03-27 21:12:08 -07:00
Kenny Root
4898087be9 Merge changes Ibdf23227,I3681f98c
* changes:
  Update Wifi to use new keystore function
  Add signing to keystore
2012-03-27 20:42:15 -07:00
Daniel Sandler
fa7887bebf Intruder alerts with actions and swipe-to-cancel.
Change-Id: I1d8c7d32bcbf4d3910bb866431e92a8639e4e28b
2012-03-27 22:28:53 -04:00
Daniel Sandler
fc90b6a7c7 Merge "Add text labels to intruder actions." 2012-03-27 19:19:01 -07:00
Gilles Debunne
0711047af7 Handle non DynamicLayout in Editable draw method.
An Editable text will use a BoringLayout when the text is empty.
Fallback on the regular layout draw text method when the layout
does not support the block optimisation.

Change-Id: Ie4bdb4381f2f58b71d7c35b2f5734e544e3115ea
2012-03-27 19:01:22 -07:00
Jeff Brown
73667fe34a Merge "YieldTransaction should actually commit the transaction." 2012-03-27 18:20:04 -07:00
Jeff Brown
d19ff5f95d YieldTransaction should actually commit the transaction.
Bug: 6239243
Change-Id: I2e0dfb0c8f0b062674cc2a1c14955eba9a4b9df3
2012-03-27 18:13:11 -07:00
Gilles Debunne
4cb85f6ad6 Moving focus on text should not create an Editor
Bug 6241159.

onCreateInputConnection should not create an Editor but instead
should return an input connection iff the text is editable.

Change-Id: Ie9ea55b2467f5a40e6243b36f9b44fa6dfab586f
2012-03-27 18:12:14 -07:00
Christopher Tate
3df92c50fe Merge "Fix uninstallation tracking in the Backup Manager" 2012-03-27 16:44:28 -07:00
Marius Renn
65dd3949d3 Merge "Multi-Project Commit: Move of filterfw out of system/media (2 of 7)" 2012-03-27 16:29:42 -07:00
Christopher Tate
a3d55342be Fix uninstallation tracking in the Backup Manager
This never worked properly; now it does.  We also no longer
do a redundant pair of remove/add operations when a package is
updated.

Bonus memory savings: we were keeping sets of ApplicationInfo
objects as part of the ongoing bookkeeping, but those were no longer
being used for anything other than the package names.  That's been
tossed out now and only the name strings are now used; hooray for
memory savings!

Change-Id: I4c6e592a1680e28550bcb4f76789260ded22280d
2012-03-27 16:29:35 -07:00
Eric Fischer
31074a5d5d Merge "Import translations. DO NOT MERGE" 2012-03-27 16:12:47 -07:00
Tom Taylor
db2026000a Merge "Drm encode mms parts while persisting the pdu" 2012-03-27 15:51:23 -07:00
Tom Taylor
ca184870ca Drm encode mms parts while persisting the pdu
Bug 5158047

Change-Id: I88aba9a91192fb1eb730b48efad3b2b488abad3d
2012-03-27 15:42:16 -07:00
Chia-chi Yeh
b1049210ae Merge "RTP: add a null-check in AudioStream.setDtmfType()." 2012-03-27 15:29:53 -07:00
Chia-chi Yeh
fb982db410 RTP: add a null-check in AudioStream.setDtmfType().
Change-Id: I52cbdea48affae3747942940451f4fd5ca47030f
2012-03-27 15:27:25 -07:00
Nick Kralevich
5b8fd25029 Merge "Make READ_LOGS signature|system|development" 2012-03-27 14:55:34 -07:00
John Reck
47d3d87e6d Merge "Do pause painting better" 2012-03-27 13:38:11 -07:00
John Reck
834f66b6a4 Do pause painting better
Change-Id: Ia58bbb19cea899c8826d74d7afcbd7e7c541d9c6
2012-03-27 12:52:57 -07:00
Colin Cross
d68b6f1540 Merge "move hardware feature definitions" 2012-03-27 12:33:35 -07:00
Eric Fischer
6447f22b36 Import translations. DO NOT MERGE
Change-Id: Ib76eb1342c224a7e9fba7693f5fcb7f3e816ff39
2012-03-27 12:32:15 -07:00
Amith Yamasani
8b5bce8d90 Merge "User management and switching" 2012-03-27 11:24:54 -07:00
Amith Yamasani
135936072b User management and switching
Broadcast intents that get sent out when users are added/removed/switched.

More work on generating user-specific information in package manager queries.
APIs to update user name and query a user by id.
Removed Package.mSetStopped and mSetEnabled, since they're not user specific.

User removal:
- Cleanup ActivityManager, PackageManager, WallpaperManager, AppWidgetService
  and AccountManager.
- Shutdown processes belonging to the user.

Don't show vibrate option in long-press power if there's no vibrator.

Lock the screen when switching users, to force unlocking.

Change-Id: Ib23a721cb75285eef5fd6ba8c7272462764038fa
2012-03-27 11:23:01 -07:00
Eric Laurent
79763f3ce7 Merge "Fixed headset detection broken on stingray" 2012-03-27 10:54:35 -07:00
Jeff Sharkey
40bd578db8 Merge "Avoid ClassCast when migrating ACTION_SEND extras." 2012-03-27 10:49:19 -07:00
Marius Renn
65953da463 Multi-Project Commit: Move of filterfw out of system/media (2 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
2012-03-27 10:44:45 -07:00
Jeff Sharkey
f27ea66114 Avoid ClassCast when migrating ACTION_SEND extras.
Bug: 6231948
Change-Id: I008195fa973517446b2400ed3f59af0cbf0fc925
2012-03-27 10:34:24 -07:00
Scott Main
dec4782fef am c2a6299a: am b7fd60bd: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
* commit 'c2a6299a30d8270592b1da70dbf1f6ee8e62d1eb':
2012-03-27 10:10:49 -07:00
Scott Main
9792b70257 am 7822805f: am 72d125eb: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
* commit '7822805f5b29efa3ab87af90d0c5b055a7639ab5':
  docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
2012-03-27 10:10:47 -07:00
Scott Main
63a19bdf38 am 6b59266b: am d87f2262: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '6b59266b0bf861f42b181b602115b8a8833c7212':
2012-03-27 10:10:42 -07:00
Scott Main
078ef45c89 am 1139a4f1: am 8f16f8bc: am 7fa4a28e: docs: add Coolpad to oem driver list
* commit '1139a4f1e02e48c42fa4e2862b88c0c68c145575':
2012-03-27 10:10:41 -07:00
Scott Main
adf3b51a57 am 3aba4df7: am 0824035b: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '3aba4df731388454a3f8aa842f44a62c1a41a5c2':
  docs: replace the "Contribute" message with "Design"
2012-03-27 10:10:39 -07:00
Scott Main
8b75efd288 am e5f1f3b8: am 123f828d: am 7fa4a28e: docs: add Coolpad to oem driver list
* commit 'e5f1f3b828c6ab2970788d96993378819fe1d7e2':
  docs: add Coolpad to oem driver list
2012-03-27 10:10:36 -07:00
Joe Malin
52a6b9aba8 am 7e25805d: am 5d181a39: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '7e25805dd608fbba3bc0a3cac13433ce7e00bc34':
2012-03-27 09:58:52 -07:00
Joe Malin
3ddccdb081 am 22493272: am 8ea93aa6: am 093ed383: Merge "DOC CHANGE: IME subtype article" into ics-mr1
* commit '22493272075482f4dc2d78eb8f502c9a091d78a8':
  DOC CHANGE: IME subtype article
2012-03-27 09:58:49 -07:00
Reto Meier
13ef963450 am 67422884: am 106d8460: am 20f394df: Docs: Added efficient downloads Android U class
* commit '674228845c5c19ed044534c8bc2606d0d32cc37c':
2012-03-27 09:49:40 -07:00