Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,402 Commits 3 Branches 0 Tags
cbdfd801ff5a86cc9e355a110e20936f69b0a3d6
Commit Graph

746 Commits

Author SHA1 Message Date
Mike Lockwood
8fa5b03c1b resolved conflicts for merge of fc4a3d37 to master 
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
 2011-05-16 15:49:53 -04: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
0a93d87552 Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 2011-05-16 12:34:02 -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
Gilles Debunne
056054f7c5 Merge "Links in Environment javadoc" 2011-05-16 11:14:41 -07: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
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
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
Gilles Debunne
ee1d630291 Links in Environment javadoc 
Change-Id: Ib3383152ff6114fdaba5245bc8357f78bc9d5fcf
 2011-05-13 10:09:32 -07:00
Dianne Hackborn
39cf8c97c3 resolved conflicts for merge of ec85619f to master 
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
 2011-05-12 18:37:33 -07:00
Dianne Hackborn
ec85619f02 am d46849a5: am a8138732: MR2 is going to be API 13. 
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
  MR2 is going to be API 13.
 2011-05-12 17:39:30 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13. 
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
 2011-05-12 16:26:47 -07:00
Chia-chi Yeh
47f8f0fa70 Add a method to create ParcelFileDescriptors from DatagramSockets. 
Change-Id: I16dddb2395628657b140b53a1b2fee5f311b049a
 2011-05-12 16:25:27 -07:00
Joe Onorato
f2a4568afc Merge "Fix race conditions in WakeLocks." 2011-05-04 18:13:10 -07:00
Joe Onorato
d7350e3a56 Fix race conditions in WakeLocks. 
Bug: 3439332
Change-Id: I70c583e6a73960df8faad69675947b87642c6228
 2011-05-04 18:10:19 -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
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
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
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
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
Jozef BABJAK
ad3b2e3a16 Removing dead store; it was likely a relict of debuging code. 
Change-Id: I685c6df119212f48f90dd40d01a3638a33ce2800
 2011-04-29 13:00:54 +02:00
Dianne Hackborn
9567a66a5e Deprecate a bunch of APIs. 
And clean up some documentation.

Change-Id: I7882183b3daf883b7ac6098d19f88dc7cfbcdf61
 2011-04-20 10:26:44 -07:00
Dianne Hackborn
1fadab5c36 More battery stats improvements. 
We now write to the parcel using deltas.  For common situations,
it only takes 4 bytes to write a delta (new command, time delta,
significant state changes, flags indicating additional state that
follows).

Increasing the buffer size to 128K, this give us 32,768 samples
if they all fit in the smallest delta.  A device that is doing
something every minute (like acquiring a wake lock or doing a
wifi scan) for our max target battery life of 30 days would
generate 43,200 samples.

Also some turning to the maximum time between samples at which
we decide to completely collapse two samples.

Change-Id: I074a698d27ccf9389f9585abfc983af2f5ba7a54
 2011-04-14 18:02:16 -07:00
Dianne Hackborn
0ffc988a7f Rewrite battery history storage. 
We now write battery history directly into a buffer, instead of
creating objects.  This allows for more efficient storage; later
it can be even better because we can only write deltas.

The old code is still there temporarily for validation.

Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b
 2011-04-14 10:57:22 -07:00
Elliott Hughes
4390758f27 Use an @hide libcore API to get the FileDescriptor from a Socket. 
Saves having your own native code...

Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35
 2011-04-12 14:25:23 -07:00
Doug Zongker
a4f39a6edd Merge "protect all /cache/recovery/last_* files from deletion" 2011-04-12 11:30:47 -07:00
Doug Zongker
3d5040f8d4 protect all /cache/recovery/last_* files from deletion 
Preserve any files name /cache/recovery/last_*, not just last_log,
when booting.

Change-Id: Ie36da5b9552e4a7100ecf3774fb1a8aaa22bfdbd
 2011-04-12 09:23:51 -07:00
Jeff Hamilton
40c266ef48 am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.
 2011-04-11 14:28:27 -07:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
 2011-04-11 14:23:59 -07:00
Brian Carlstrom
8c2a1a90a8 Add keychain user with special keystore access permissions 
Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
 2011-04-08 14:06:39 -07:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0. 
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
 2011-04-07 19:23:05 -07:00
Dianne Hackborn
e17aeb3103 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: Id0dbccffb217315aeb85c964e379833e6aa3f5af
 2011-04-07 18:26:15 -07:00
Dianne Hackborn
3fc982f41f Add new resource configurations for screen width/height in "dp". 
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
 2011-04-06 11:00:37 -07:00
Mike Lockwood
cace13d72a Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Jason parks
c5a229665d am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Jason parks
5ee250aa74 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Mike Lockwood
8fa5f804e2 StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: Icf3301827dd27e8430bd44eaafde517a31ef035a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-04 18:54:03 -04:00
Jeff Hamilton
7bb236c3b5 am 84d34078: Make the NFC UID forward compatible. 
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde':
  Make the NFC UID forward compatible.
 2011-04-04 14:42:44 -07:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Jeff Hamilton
84d340781b Make the NFC UID forward compatible. 
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
 2011-04-01 13:43:28 -05:00
Jeff Hamilton
f9fb0abbd6 am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
  Update the value for the NFC shared UID.
 2011-03-30 16:31:27 -07:00
Jason parks
cca2f2f987 Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID. 
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
 2011-03-24 21:39:58 -05:00
Jesse Wilson
112d339673 Fix MemoryFile's output stream to advance. 
Previously it was not useful.

Change-Id: I0bcc06b65bab33a38a0b0148c020509076a51b1c
http://code.google.com/p/android/issues/detail?id=11415
 2011-03-24 18:18:19 -07:00
Dianne Hackborn
315f19be8e am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:07:17 -07:00
Dianne Hackborn
daa71254f3 am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:05:08 -07:00