21773 Commits

Author SHA1 Message Date
Joe Onorato
d7350e3a56 Fix race conditions in WakeLocks.
Bug: 3439332
Change-Id: I70c583e6a73960df8faad69675947b87642c6228
2011-05-04 18:10:19 -07:00
Jeff Sharkey
2a2dc6894a Merge "Return NetworkStats bundle from NM service." 2011-05-04 17:49:01 -07:00
Chet Haase
42a3a39e23 Merge "Add ability for hierarchyviewer to output displaylist info" 2011-05-04 17:30:30 -07:00
Chet Haase
b2a4b52e8d Add ability for hierarchyviewer to output displaylist info
Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Id32f62569ad1ab4d533bc62987f3a7390c1bb4e6
2011-05-04 17:18:27 -07:00
Robert Greenwalt
a9faac5554 am 5673c13b: am aacd80fd: Fix build break.
* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
  Fix build break.
2011-05-04 16:59:47 -07:00
Robert Greenwalt
5673c13b51 am aacd80fd: Fix build break.
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
  Fix build break.
2011-05-04 16:55:26 -07:00
Robert Greenwalt
aacd80fd87 Fix build break.
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
2011-05-04 16:50:10 -07:00
Jeff Sharkey
9a13f36cdd Return NetworkStats bundle from NM service.
Introduce NetworkStats which is a collection of network statistics,
which should match the structure communicated by kernel module through
netd.  Will introduce tags and fg/bg stats later.  Kept entirely in a
flat data structure to optimize parcel speed.

Initial pass at returning NetworkStats from NetworkManagementService,
both summary and details.  Will eventually pull data from kernel module
over netd connection.

Change-Id: I92d9f61678ec8c22e2ce26775fb035a0cf32413f
2011-05-04 16:07:21 -07:00
Gilles Debunne
ba4997ac35 All SuggestionSpans are removed when the window loses focus.
SuggestionSpans should have a limited, well defined life-span.
Saving these in onSaveInstanceState is inappropriate since these can
be very large and will not necessarily be saved/loaded by the application.

Keeping them in the application when it is dismissed is not consistent
since they may be garbage collected while the application is not active.

Change-Id: Icebf6cb0218528f9d162a689ad33efeb770fbede
2011-05-04 14:28:38 -07:00
Irfan Sheriff
1a5b6098d5 Handle GET_POWER failures
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
2011-05-04 14:23:42 -07:00
Joe Onorato
c6cc0f8c19 Rename ViewRoot to ViewAncestor.
ViewRoot is about to be a new public class for poking at ViewAncestor.

Change-Id: Ie95d707c6d8bbb48f78d093d7b2667851812a7d5
2011-05-04 14:08:11 -07:00
Robert Greenwalt
b6f8bff109 am 9c7e6fc5: am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit '9c7e6fc50614cc1739d4bfbf6187893c27b01a67':
  Add auto-restore timeout for secondary networks.
2011-05-04 12:47:30 -07:00
Daniel Sandler
67440d15e3 Merge "New art. FPO, of course." 2011-05-04 12:36:35 -07:00
Jeff Sharkey
a62057496b Merge "Avoid throwing when forceRefresh() missing server." 2011-05-04 11:58:55 -07:00
Jeff Sharkey
f055829f35 Avoid throwing when forceRefresh() missing server.
Bug: 4377651
Change-Id: Ia950a1e62d39ce9148827ebb4535f6441911b195
2011-05-04 11:58:06 -07:00
Daniel Sandler
f8d704b51d Consolidate notification layouts by removing xlarge versions.
This will bring the phone and the tablet very strongly in line.

Any readability/usability/functional improvements we make for
one should appear instantly in the other.

Change-Id: I51baeed07936304ec842a338864205bacf6e646f
2011-05-04 14:44:28 -04:00
Daniel Sandler
0c19aaaebb Merge "On-screen navigation bar (separate from the status bar)." 2011-05-04 11:26:38 -07:00
Gilles Debunne
6e222bcadb Off by one bug in TextView's suggestions popup.
Change-Id: I39615bb75e1e2e24ba5c5a65f1b3e11f8fadd89f
2011-05-04 10:25:04 -07:00
Robert Greenwalt
9c7e6fc506 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Daniel Sandler
d108538546 Merge "Start honeyphoning the notification panel." 2011-05-04 09:00:18 -07:00
Mike Lockwood
4397c32402 am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
2011-05-04 08:57:29 -07:00
Mike Lockwood
21c0800f71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
2011-05-04 08:57:23 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
2011-05-04 08:57:07 -07:00
Daniel Sandler
b48e74b10c Start honeyphoning the notification panel.
Notifications on phones should look much more like Honeycomb
now, including large icon and veto support.

And less crashing.

Bug: 4322305
Change-Id: Ibde6f66fbae1c8d3167085f7b0fd79118485f05c
2011-05-04 11:17:07 -04:00
Mike Lockwood
c535f7f291 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: Iaf9cf120217e8417d328a51db0d82be6835b0ff0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
d3e4290c04 DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Bjorn Bringert
d58efd38e7 Merge "Check for exceptions before calling back into Java" 2011-05-04 02:56:04 -07:00
Adam Powell
f3cd1d957c Bug 4269063 - Populate contentdescription in action bar
home/up and action menu

Change-Id: Ia09d78d9d37848621e025b9af93a92cfd3bb8dc7
2011-05-03 19:43:55 -07:00
Robert Greenwalt
f2102f7a1a Add auto-restore timeout for secondary networks.
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
2011-05-03 19:10:26 -07:00
Mike Lockwood
f60ba87f07 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:55 -04:00
Adam Powell
e409851954 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Adam Powell
d1f4207ba5 Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28
Change-Id: Icfcd8c2aadd0fb9e49296b8318858317407e1b7f
2011-05-03 17:30:48 -07:00
Iliyan Malchev
bf8b45cd15 Merge changes I5c61ac40,I67c40a3c,I3e2ddd01
* changes:
  frameworks/base: switch CameraService to a HAL module
  frameworks/base: make the ANativeWindow query() method const
  frameworks/base: include system/core header camera.h in Camera.h
2011-05-03 16:38:07 -07:00
Wink Saville
ec9b5d17af am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit 'ee081bf5ee936396a89d5bd2b29487047b260f49':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:36:36 -07:00
Wink Saville
ee081bf5ee am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:33:08 -07:00
Conley Owens
1c6afcbf1f am 2d40bf91: am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '2d40bf91e6ad71505ec84743c5ad0b854ecf5928':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:19:53 -07:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:14:31 -07:00
Iliyan Malchev
9c7ac0d142 frameworks/base: include system/core header camera.h in Camera.h
We define struct CameraInfo in this camera/Camera.h, even though an identical
struct camera_info is defined in hardware/camera.h (but not in
hardware/camera_defs.h).  We may not export struct definitions from the HAL
into headers which may find their way into the NDK.

This commit also renames FRAME_CALLBACK_FLAG_xxx to CAMERA_FRAME_CALLBACK_xxx.

Change-Id: I3e2ddd01d61bf5371ff2fc1a397995e0f1ee11f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 15:49:39 -07:00
Mathias Agopian
9d216f7b0e Merge "improve documentation for the ROTATION_VECTOR sensor" 2011-05-03 15:36:23 -07:00
Mathias Agopian
557975c2b5 Merge "Add documentation for Sensor.TYPE_PRESSURE" 2011-05-03 15:25:42 -07:00
Adam Powell
0d42f17f5e Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated" 2011-05-03 14:55:54 -07:00
Adam Powell
0d8ec1d739 Fix bug 4345702 - update action bar tab views when the Tab object is
updated

Also fix a bug with visibility of split action bar views.

Change-Id: Iadd63d5e9b6cb9debab0f7a777e424e4c4807a13
2011-05-03 14:50:08 -07:00
Ramesh Sudini
0e7b5a0287 IMS: Provide net_admin permission so that IPSec could be configured/used.
IMS configures the security database in kernel with keys generated from ISIM.

Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
2011-05-03 13:46:08 -07:00
Conley Owens
eac835e52e am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 12:07:19 -07:00
Eino-Ville Talvala
3723396c7a Merge "Add an auto-exposure lock feature to the Camera API." 2011-05-03 11:07:33 -07:00
Eric Fischer
3e456fa745 Merge "Import revised translations." 2011-05-03 10:57:54 -07:00