drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,681 Commits 1 Branch 0 Tags
Commit Graph

20761 Commits

Author SHA1 Message Date
Robert Greenwalt
aacd80fd87 Fix build break. 
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
 2011-05-04 16:50:10 -07:00
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07: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
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
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
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 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
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
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
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
42f139c069 docs: more documentation for ProgressBar 
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
 2011-04-29 14:51:05 -07:00
Irfan Sheriff
3fc75e9267 Define Protocol class for use with StateMachine 
Adds a common namespace for communication across
different state machines

Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
 2011-04-28 11:10:03 -07:00
Robert Greenwalt
af2eb4f6db Make new networkAttribute parameter non-optional. 
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
 2011-04-25 16:04:45 -07:00
Freeman Ng
3b9089c1fa new LTE prepay related values 
bug: 4082355
Change-Id: Id5a8f9b8bca64d9cf6ee13b00bd32c4911e9a3fa
 2011-04-22 16:42:57 -07:00
Scott Main
69ccfd7a29 am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit 'ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83':
  docs: add a little info to Configuration class description
 2011-04-21 10:55:20 -07:00
Scott Main
ca7f30ebb2 am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit 'b8a57841316171d6db4311a65914720213516153':
  docs: add a little info to Configuration class description
 2011-04-21 10:53:08 -07:00
Scott Main
63848e3df3 docs: add a little info to Configuration class description 
Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
 2011-04-20 22:20:46 -07:00
Wink Saville
64c42cae44 Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
 2011-04-18 14:55:10 -07:00
Eric Fischer
b5b49ba8fc Import revised translations. DO NOT MERGE 
Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213
 2011-04-14 13:59:43 -07:00
Xia Wang
d69ec89f5d am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
 2011-04-13 15:34:29 -07:00
Xia Wang
46b59ef01b Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 2011-04-13 15:13:10 -07:00
Benoit Goby
43be7a6120 EthernetDataTracker: implement setDependencyMet 
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
 2011-04-11 20:13:10 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters 
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
 2011-04-11 16:33:43 -07:00
Wink Saville
3156a8c169 Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab Move ProcessedMessage into HierarchicalStateMachine. 
ProcessedMessage is really private to HSM and so moving
it into the HSM class.

Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
 2011-04-11 11:51:28 -07:00
Freeman Ng
b7e8a54d98 Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 2011-04-11 11:10:18 -07:00
Xia Wang
dddfaa75e7 Fix access point parsing: reset static link property after parsing 
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi

Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
 2011-04-08 16:31:01 -07:00
Freeman Ng
96be4e01e6 Add prepaid data services URL to Secure Settings 
This is really a Gservices value being accessed through Secure Settings

bug: 4100048
Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
 2011-04-07 18:21:40 -07:00
Nicolas Roard
3e37a2f3ae am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:24:05 -07:00
Nicolas Roard
fcba23536b Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Nicolas Roard
4bae836784 Remove uncalled function -- java counterpart of 
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
 2011-04-07 15:04:26 -07:00
Teng-Hui Zhu
29fa50be24 am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:22:33 -07:00
Robert Greenwalt
70c3d1c23b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
5d6f116703 Merge "Make LinkProperties comparable." into honeycomb-LTE 2011-04-07 12:44:04 -07:00
John Wang
4e900091c4 Make LinkProperties comparable. 
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
 2011-04-07 12:36:56 -07:00
Robert Greenwalt
d55a6b498d Add external dependency API. 
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
 2011-04-07 12:28:37 -07:00
Teng-Hui Zhu
2fcf82aee3 DO NOT MERGE : cherry pick of change Ieb7ae26b from master 
Buffering in full screen mode will show progressView

bug:4187252
Change-Id: Ia44d880ab126c2439fb13504db87492d45c90bc8
 2011-04-07 09:14:16 -07:00
Teng-Hui Zhu
a9cadefde4 DO NOT MERGE : cherry pick of change I0f9f2c65 from master 
Add the loading progress UI when buffering

bug:4187252
Change-Id: Ifbf63b248ac5f0e340be4057e0dcd80d33483662
 2011-04-07 09:14:05 -07:00
Teng-Hui Zhu
b3bb6fd5e3 am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1 
* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
  Fix the issue the video can't start to play
 2011-04-07 09:07:52 -07:00
Teng-Hui Zhu
b25181aacc Merge "Fix the issue the video can't start to play" into honeycomb-mr1 2011-04-07 08:52:45 -07:00
Teng-Hui Zhu
0504967cb0 Fix the issue the video can't start to play 
In full screen mode, we shall not always rely on the auto start info.
If the auto start is false, it will prevent the video from playing.

The auto start should always happen inline mode when prepared.
If we switch into full screen mode while playing, we will also do auto start.

bug:4260063
Change-Id: I4b13c30b1f2c219951dc8edd659e221a21c86c2b
 2011-04-06 18:20:19 -07:00
Eric Fischer
ad3bddab92 am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
  Import revised translations.  DO NOT MERGE
 2011-04-06 14:12:31 -07:00
Eric Fischer
6d5f5faae0 Import revised translations. DO NOT MERGE 
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
 2011-04-06 13:47:57 -07:00