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

50674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Derek Sollenberger
d39d1affe8 Updates resulting from the Skia merge (revision 1327) 
Change-Id: I2a8f5869dbe95bb594f2ba5d7278f9b330e6f17a
 2011-05-16 15:30:40 -04: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
Dianne Hackborn
5ad5c37ebf am fbdf9df0: (-s ours) am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 
* commit 'fbdf9df053800afb25453630d11bd48cbc068271':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
 2011-05-16 11:12:45 -07:00
Dirk Dougherty
37fefbbd9e am b131d288: am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'b131d288f2c90daf95c678ad12c9708082a2977a':
  Doc change: typo fix
 2011-05-16 11:10:18 -07:00
Scott Main
d0f77476fb am 833b325f: am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '833b325f5a22f88c1ab84eef5b8caf79cd292036':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:10:15 -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
Dirk Dougherty
b131d288f2 am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
  Doc change: typo fix
 2011-05-16 11:07:02 -07:00
Scott Main
833b325f5a am 81dd428d: am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '81dd428d70ae14dcceae3bab5271d726abf2f324':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:06:59 -07:00
Guang Zhu
97499df874 change how test sets timeout for webkit dump 
there are cases where webkit dump timed out, but a RuntimeException
was not thrown (as it should have) after the timeout limit was
reached. It's probably because the Looper message to invoke time
out is obtained after the message to dump webview. This change
adjusts the order of obtaining the message so hopefully it can make
the timeout work for real.

Change-Id: I4197699f5aad765c88dc81123d052e4c49d7c53d
 2011-05-16 11:06:53 -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
Dirk Dougherty
4bfc1cc0a9 am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit '8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
  Doc change: typo fix
 2011-05-16 11:03:56 -07:00
Scott Main
81dd428d70 am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '582c1361e8a6443812a97f18094be1f8279645a0':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:03:53 -07:00
Dianne Hackborn
700ab1c758 Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 2011-05-16 11:02:29 -07:00
Dirk Dougherty
8b8bfc5d28 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
 2011-05-16 11:01:44 -07:00
Scott Main
582c1361e8 am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:01:42 -07:00
Fabrice Di Meglio
35844a3a4e Merge "Fix bug #4415576 Gmail text looks broken" 2011-05-16 11:00:02 -07:00
Dirk Dougherty
babf844f46 Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Scott Main
5eba0e98d1 docs: update featured videos and increase the max results for each playlist 
Change-Id: I8d7a547960ed5bae4ea2eec9e8bac14c421d3746
 2011-05-16 10:56:26 -07:00
Andreas Huber
9f4b95b92e Merge "Fix module tags on stagefright software decoders." 2011-05-16 10:47:50 -07:00
James Dong
637ca640ad Merge "Support platform and camera dependent recording start time offset" 2011-05-16 10:46:33 -07:00
Dirk Dougherty
58610ba382 Doc change: typo fix 
Change-Id: I078cb313c02b37571b573f4fb4e68e11c45cc271
 2011-05-16 10:41:34 -07:00
Scott Main
a987eddc51 am 8e3fdf81: am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit '8e3fdf812b7684727d69b7326a02d7fdf8472e3f':
  docs: add oem driver for alcatel
 2011-05-16 10:40:56 -07:00
Scott Main
8e3fdf812b am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit 'fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
  docs: add oem driver for alcatel
 2011-05-16 10:37:33 -07:00
Scott Main
fa5a08beed am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel 
* commit '1ff0131e77e625af3100720a3552dc1f4064421d':
  docs: add oem driver for alcatel
 2011-05-16 10:24:28 -07:00
Scott Main
1ff0131e77 am fc0ea7ea: docs: add oem driver for alcatel 
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
  docs: add oem driver for alcatel
 2011-05-16 10:20:59 -07:00
Scott Main
fc0ea7ea5d docs: add oem driver for alcatel 
Change-Id: I429583a3f2f4f91a6ffa21367b474f537ad28c96
 2011-05-16 09:52:45 -07:00
Andreas Huber
6521ec7b91 Fix module tags on stagefright software decoders. 
Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
 2011-05-16 09:41:06 -07:00
Ben Murdoch
f4fea9a903 Merge WebKit at r75993: Update Makefiles 
Update BrowserPlugin makefile post WebKit source code
move.

Change-Id: I5c8e1f4db80fc066171e6ddd74b0a5e61beadb3d
 2011-05-16 11:58:21 +01:00
Wink Saville
7b06e3516c am 7a2a87d6: am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE 
* commit '7a2a87d6457885c5d3d4dbf335be101aa9c5c3ab':
  Support for Vendor RIL dump of baseband logs
 2011-05-15 14:47:45 -07:00
Wink Saville
32ebca5ba2 am 58779700: am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE 
* commit '58779700df18d52edf1102c6fcb3731f28d37a94':
  Telephony: Handle Icc Status Changed Event.
 2011-05-15 14:47:42 -07:00
Wink Saville
7a2a87d645 am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE 
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
  Support for Vendor RIL dump of baseband logs
 2011-05-15 14:43:52 -07:00