Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,625 Commits 3 Branches 0 Tags
c41aefe1d4c862a9fbaf717ffb886bbd702c94f2
Commit Graph

16981 Commits

Author SHA1 Message Date
Robert Greenwalt
c41aefe1d4 am 59b1a4ed: Switch to use netd to add/remove routes. 
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
  Switch to use netd to add/remove routes.
 2011-05-18 16:33:16 -07:00
Jean-Baptiste Queru
111d17ce51 Merge 4b999030 
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
 2011-05-18 15:33:27 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes. 
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
 2011-05-18 15:25:43 -07:00
Jean-Baptiste Queru
4b999030ad am 6c427617: Merge "support humidity sensor type" 
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
  support humidity sensor type
 2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Kazuhiro Ondo
b22a9fd9bb am 01758e81: Linkproperties update via unsol data call state change. 
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
  Linkproperties update via unsol data call state change.
 2011-05-18 00:02:31 -07:00
Kazuhiro Ondo
01758e81b3 Linkproperties update via unsol data call state change. 
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
 2011-05-17 20:53:40 -07:00
Adam Powell
961f8bef18 am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2 
* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
 2011-05-17 20:28:06 -07:00
Adam Powell
98603eed2f am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2 
* commit '30a76196c8f426b530a80166817d3280acb2b100':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
 2011-05-17 20:25:58 -07:00
Adam Powell
5d6c990b7f Fix bug 4416126 - orientation change bug with action bar overflow menu 
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
 2011-05-17 20:20:52 -07:00
Mike Lockwood
53b988ba18 am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:49:40 -07:00
Mike Lockwood
5a79cfd751 am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:44:51 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor 
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 17:19:37 -04:00
Adam Powell
2b6ace5811 am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2 
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
  Prevent cases of bogus action bar measurement.
 2011-05-17 12:21:22 -07:00
Adam Powell
bd32a79ecb am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2 
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
  Prevent cases of bogus action bar measurement.
 2011-05-17 12:18:05 -07:00
Adam Powell
1b4a1628f3 Prevent cases of bogus action bar measurement. 
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
 2011-05-17 12:14:17 -07:00
Adam Powell
143c529f28 am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
 2011-05-17 09:55:53 -07:00
Adam Powell
21f1d49f0e am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
 2011-05-17 09:45:29 -07:00
Adam Powell
a7f52d4665 Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2 2011-05-17 09:41:52 -07:00
Dianne Hackborn
b68c768ddb am 41744836: am 7916ac65: Add new command line option to change global screen size. 
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
  Add new command line option to change global screen size.
 2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c am 7916ac65: Add new command line option to change global screen size. 
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
  Add new command line option to change global screen size.
 2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc Add new command line option to change global screen size. 
For example:

adb shell am display-size 1024x600

Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
 2011-05-16 20:55:41 -07:00
Adam Powell
b07f943273 DO NOT MERGE Use action bar overflow menus on large configurations as 
well as xlarge.

ICS will have a more intelligent way of determining this.

Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
 2011-05-16 13:46:38 -07:00
Dianne Hackborn
60e13114eb am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24 am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:13:00 -07:00
Dianne Hackborn
0eac092766 Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 2011-05-16 13:10:23 -07:00
Dianne Hackborn
68066c2f38 DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked. 
Not yet working, so turned off.

Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.

Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
 2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9 am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:04:49 -07:00
Dianne Hackborn
fddd927fb7 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:02:57 -07:00
Dianne Hackborn
f97ed77197 am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:01:38 -07:00
Dianne Hackborn
9d0f2c6d97 Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation. 
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
 2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
fc4a3d37ef am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:38:36 -07:00
Mike Lockwood
b822d2464d am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:36:29 -07:00
Mike Lockwood
0a93d87552 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -07:00
Dianne Hackborn
ac8dea12c1 DO NOT MERGE. Integrate from master: Rework display size access. 
Applications now get the display size from the window manager.  No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
 2011-05-16 11:58:27 -07:00
Mike Lockwood
2f6a388553 StorageManager: Clean up and generalize storage configuration resources 
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.

Add android.os.storage.StorageVolume class

StorageManager.getVolumeList() now returns an array of StorageVolume

Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-16 14:29:23 -04:00
Dianne Hackborn
fbdf9df053 am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:09:31 -07:00
Dianne Hackborn
2a20583a5f am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:06:28 -07:00
Dianne Hackborn
24df0757f8 am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
 2011-05-13 18:39:01 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps. 
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
 2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. 
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
 2011-05-13 18:31:04 -07:00
Dianne Hackborn
71da32074c am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
  Fix a bug where an action bar could be created when it should not be.
 2011-05-13 16:29:40 -07:00
Dianne Hackborn
7d87c37b03 am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
  Fix a bug where an action bar could be created when it should not be.
 2011-05-13 16:26:44 -07:00
Dianne Hackborn
6121f06ed5 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Dianne Hackborn
28a8bce691 am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:45:23 -07:00
Dianne Hackborn
6824c135fe am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master
 2011-05-13 15:36:48 -07:00