47858 Commits

Author SHA1 Message Date
Marco Nelissen
1cf74fb3c4 DO NOT MERGE Fix media scanner uri handling.
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04: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
91dd02c340 DO NOT MERGE MountService: Fix running media scanner at boot.
Change-Id: I67ff2ccde7e03143167b8c59726ffb741c96e028
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
b9135638c5 DO NOT MERGE Fix deadlock in MountService
It is not safe to call into vold with a lock held on mVolumeStates
since we will receive events back from vold on a different thread.
So in the boot completed handler we make a copy of the volume list and
then call vold to mount volumes after releasing the lock

Change-Id: Ic9836c2e1e8a5677d0c4e33476a72081f69823a0
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
Mike Lockwood
f097fc2fee DO NOT MERGE MountService: Add support for multiple volumes
Change-Id: I45ee0e5735a6d72c635f6d22320e8b13bccc3847
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:55 -04:00
Robert Ly
88741823a6 am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:57:52 -07:00
Glenn Kasten
3b698d181b am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.
2011-05-03 16:57:45 -07:00
Robert Ly
7c2d14d596 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00
Robert Ly
0cc4b8a787 Doc change: fixing minor bug for xml resources
bug 4376713

Change-Id: I4c969810eaaf053f8326721b71fbe494b542082d
2011-05-03 16:50:16 -07:00
Glenn Kasten
9d8c6215d1 Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 2011-05-03 16:46:12 -07:00
Wink Saville
3ed0a1ec7a Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 2011-05-03 16:19:58 -07:00
Robert Ly
bde2b92f58 Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
Change-Id: Ib6a5c3a958a77f5ef9322fb79b2da19763ec364d
2011-05-03 15:57:27 -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
Dan Morrill
75c664582c am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:26:16 -07:00
Wink Saville
d0d44c4e98 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Wink Saville
0b80114a2d Make DataConnection asynchronous.
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
2011-05-02 21:55:04 -07:00
Robert Ly
8cdb2e2d83 adding the usb apis to the resources browser
Change-Id: I79e9f93ebfa3aaf03e4f4deeb70d6c5a7a4ad07f
2011-05-02 17:49:05 -07:00
Dan Morrill
8325c3a891 Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change
since file was renamed, making cherry-pick impossible.

Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
2011-05-02 14:06:06 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Wink Saville
7e74c60db5 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel.
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
2011-05-02 10:44:56 -07:00
Wink Saville
aa44b52ee0 Fix bug in RIL#getDataCallState.
Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
2011-05-02 10:00:53 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Wink Saville
6e748780ef Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 2011-04-29 16:12:59 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
1462813a28 Merge "docs: more documentation for ProgressBar" into honeycomb 2011-04-29 14:52:20 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Scott Main
205d6fb38d am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
  docs: tweak table headers for config qualifiers
2011-04-29 14:46:28 -07:00
James Dong
f181e416ee am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:42:58 -07:00
Scott Main
be2da3c9b6 am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
  docs: tweak table headers for config qualifiers
2011-04-29 14:42:55 -07:00
Scott Main
c7eb47fad4 docs: tweak table headers for config qualifiers
Change-Id: Idc8d48f1db9b6b87372a49095b034edff9baecfa
2011-04-29 14:12:24 -07:00
Eric Fischer
953d097e88 Import revised translations. DO NOT MERGE
Change-Id: If18189bb816828187274ff5a1ed122767decc817
2011-04-29 13:58:45 -07:00
Kazuhiro Ondo
f0055d5e3c CDMALTE: Evaluate data network type in pollStateDone()
During LTE to HRPD handover, CDMA data network type (1X, DO, RevA)
was not detected immediately as the checking was not done without
waiting for the LTE state. The patch will wait for pollStateDone
to determine new data network state.

Change-Id: I2d63d43df1f3124ba27f77897abef30f06be650d
2011-04-29 11:47:07 -07:00
Robert Greenwalt
5f2ff42b28 Add data to bugreports.
Include IPv6 routes and iptables data.

Change-Id: Ie9bca8a935f93933082eef0c45f83a17be76b7ed
2011-04-29 09:43:49 -07:00
James Dong
ec78f551b5 Add avg bandwidth estimate every 2 seconds - do not merge.
This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
2011-04-28 17:16:03 -07:00
Scott Main
d7f739b13e am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:25:22 -07:00
Scott Main
114ba198f5 am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:21:46 -07:00
Scott Main
c59e80c4eb Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb 2011-04-28 14:08:57 -07:00
Wink Saville
a68a61dfe3 Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE 2011-04-28 13:51:31 -07:00
Wink Saville
05fcd239ab Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE 2011-04-28 13:51:22 -07:00
Ramesh Sudini
11cee41f3e Telephony: Corrections to signal strength values.
RSRP is already -ve.

Change-Id: Ieff689a98088ad6aad9cfc6516169c92bbb0015d
2011-04-28 12:24:55 -07:00
Ramesh Sudini
662b016d6e Telephony: Data availability indication upon records loaded.
This will make sure if records loaded comes after radio availability we dont miss sending
out dataAvailability.

Change-Id: Ibbecaa89f28e1441e799bf1681d0b4692cf0f13a
2011-04-28 12:24:13 -07:00
Kazuhiro Ondo
379cbb1dcc Send STK Service Running RIL Request after sim module is ready
Currently "STK Service Running" is sent as soon as phone app is
started. And depending on the timing of vendor RIL initialization
the event may not be handled. This patch waits for SIM_READY,
RUIM_READY or NV_READY indicating vendor's SIM (equivalent) module
become ready to process the event.

Change-Id: I4182a5413201f11856989664c8f19ae1eca48e2f
2011-04-28 12:23:25 -07:00
Wink Saville
7353301f73 Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE 2011-04-28 11:50:24 -07:00
Wink Saville
1a517d0c25 Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 2011-04-28 11:50:15 -07:00