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

50391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
9539d9f65a libutils: add a binary blob cache implementation. 
This change adds an implementation of a cache that stores key/value
pairs of unstructured binary blobs.

Change-Id: Idd01fdabedfa3aed6d359a6efb0592967af52651
 2011-05-17 16:58:37 -07:00
Irfan Sheriff
8318561e9a am 33285c69: am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2 
* commit '33285c69a6bb01d8e3420694e257802f95d1e884':
  Fix ISO country code of Slovenia.
 2011-05-16 14:12:08 -07:00
Scott Main
25c3cbef60 am 5bb0c89c: am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '5bb0c89cf86c415a94d72469684234d3f7e067ec':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:10:09 -07:00
Irfan Sheriff
33285c69a6 am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2 
* commit '190554246b6fda3453f4a7994fb461f841e82a4a':
  Fix ISO country code of Slovenia.
 2011-05-16 14:09:26 -07:00
Scott Main
5bb0c89cf8 am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '0593d383f3c50853123fa99fea172b37463990e0':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:06:25 -07:00
Irfan Sheriff
190554246b am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2 
* commit 'cff1093fd2a2e64634e122e32d489aa40113c22f':
  Fix ISO country code of Slovenia.
 2011-05-16 14:06:11 -07:00
Scott Main
0593d383f3 am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:03:43 -07:00
Irfan Sheriff
cff1093fd2 Merge "Fix ISO country code of Slovenia." into honeycomb-mr2 2011-05-16 14:02:39 -07:00
Scott Main
8a29ffa3b0 am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:01:30 -07:00
Robert Greenwalt
188b9e9ec0 Fix ISO country code of Slovenia. 
Misread an IBM site and thought it was sl-sl, but really it is sl-si.

fixes public bug 16021

Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
 2011-05-16 13:58:37 -07:00
Scott Main
7a701024be docs: add redirects to key legacy docs 
bug: 4439292

Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
 2011-05-16 13:54:02 -07:00
Dianne Hackborn
dffa4761c8 am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2 
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.
 2011-05-16 13:18:54 -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
e5eb6a9e01 am 63446167: (-s ours) 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 '63446167b9d6d9ed3410320d17e8fe816caf6c42':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
 2011-05-16 13:11:27 -07:00
Dianne Hackborn
b0acb1e890 am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:11:24 -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
Mike Lockwood
e6f3f54e05 resolved conflicts for merge of b107f4de to master 
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
 2011-05-16 16:08:12 -04: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
Wink Saville
c6aa9e8cc2 am 2ead69e1: am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit '2ead69e11631b9bc2b12fe0cd8dbd27155559276':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 13:03:21 -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
8fa5b03c1b resolved conflicts for merge of fc4a3d37 to master 
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
 2011-05-16 15:49:53 -04:00
Mike Lockwood
b107f4dec3 am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:41:25 -07:00
Wink Saville
2ead69e116 am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 
* commit 'fe5b5d3700a5c67b5e8fcee324efe0fa24c4622c':
  Implement incremental data stall recovery in GSM DCT
 2011-05-16 12:41:16 -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
e23639e038 am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:38:18 -07:00
Wink Saville
fe5b5d3700 Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE 2011-05-16 12:37:55 -07:00
Robert Ly
4cfa909c6d am 0c5ae3fc: am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '0c5ae3fc8892a06e3dd5192d24f0b46bb59c769b':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:37:46 -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
15afd076d6 Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 2011-05-16 12:34:35 -07:00
Robert Ly
0c5ae3fc88 am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '1f2a335f98503bab178d1d868a9cba0451481b7d':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:34:26 -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
Robert Ly
1f2a335f98 am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '79d3f6305fc7dda68faf674e1c500f97cc4dd570':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:31:48 -07:00
Robert Ly
79d3f6305f am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:29:17 -07:00
Robert Ly
904f48107e doc change: added link to diydrones and a few small changes 
Change-Id: I4ca757f3dfb60f442c34cfbb4e7145eacb42b395
 2011-05-16 12:19:24 -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
Romain Guy
51d6eb7dcf Fix crash when using a SimpleCursorAdapter initialized with a null Cursor. 
Change-Id: Ia7d078db8ab941c830663e6af7cbb07d7bad24a8
 2011-05-16 11:55:08 -07:00
Romain Guy
0c0b768e15 Fix NPE when calling PopupWindow's default constructor. 
Change-Id: I5317b052236d758fd3b9055c9940fbb10ec7b123
 2011-05-16 11:54:09 -07:00
Romain Guy
02739a8eec Fix javadoc issues 
Change-Id: Ife66a8664955ac1a79b6ffd0080000c820f24632
 2011-05-16 11:53:31 -07:00
Kazuhiro Ondo
47e326c8ac Implement incremental data stall recovery in GSM DCT 
Change-Id: Ibc43845c618fd1bf0b5a697568ba475e78e9d58e
 2011-05-16 11:43:01 -07:00
Mike Lockwood
51690544aa MTP: Have GetStorageInfo command return correct storage type for removable storage 
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-16 14:29:45 -04: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
Guang Zhu
8083419cee Merge "change how test sets timeout for webkit dump" 2011-05-16 11:28:17 -07:00
Gilles Debunne
056054f7c5 Merge "Links in Environment javadoc" 2011-05-16 11:14:41 -07:00