Fred Quintana
f910cf4dcb
am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 18:56:12 -07:00
Dianne Hackborn
525bb6a0cd
am b6c45927: am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
2010-04-27 12:27:36 -07:00
Fred Quintana
018579c473
am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
...
Merge commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken
* commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08':
Add JavaDoc for SyncResult
2010-04-27 12:02:32 -07:00
Fred Quintana
6ce78924eb
Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 11:56:16 -07:00
Fred Quintana
20c640e0f4
Add JavaDoc for SyncResult
...
http://b/2420252
Change-Id: I88be5232d54959f6ec3480c36751a8fb7dc369fd
2010-04-27 11:21:53 -07:00
Dianne Hackborn
ff121670b7
am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken
2010-04-27 11:20:31 -07:00
Dianne Hackborn
b6c459276f
am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
...
Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken
* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE
2010-04-27 11:18:24 -07:00
Dianne Hackborn
34483a0f6e
resolved conflicts for merge of 5a8f877c to kraken
...
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
2010-04-27 11:06:43 -07:00
Dianne Hackborn
94c567e1e3
Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE
...
There was a gap in the bit numbers.
Change-Id: I0feef7dc4abed5db7412659b5ad078caffe4f2d4
2010-04-26 18:50:11 -07:00
Dianne Hackborn
3202d38022
Fix issue #2631417 : Expose FLAG_EXTERNAL_STORAGE
...
Also update 8.xml to match the current API.
Change-Id: I668fe56f6c156c2e8daa458baa7410fdb8ebef52
2010-04-26 17:51:34 -07:00
Adam Powell
b9eab6c793
resolved conflicts for merge of 81cd2e90 to master
...
Fixed public.xml value padding for kraken/master
Merge commit '81cd2e90' into manualmerge
Conflicts:
api/current.xml
Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
2010-04-23 16:49:54 -07:00
Adam Powell
81cd2e90cc
Logo attribute for manifest and PackageManager methods to fetch it
...
Change-Id: I2c5ac44a4e2af982a616b2012901d7395013b19f
2010-04-23 15:49:07 -07:00
Suchi Amalapurapu
ef404b7aa0
am 0c64ff75: am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
2010-04-20 15:22:15 -07:00
Suchi Amalapurapu
0c64ff7568
am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
...
Merge commit 'd32f942280cc4390ab853321557eef06292b300e' into kraken
* commit 'd32f942280cc4390ab853321557eef06292b300e':
Fix 2610961
2010-04-20 15:14:41 -07:00
Suchi Amalapurapu
89e0c1a9f5
Fix 2610961
...
Unhide broadcast intents that are sent when sdcard gets mounted/unmounted.
Change-Id: Ibb5700178e98f657f1c2b6a2f83e722151c4a44f
2010-04-20 14:08:08 -07:00
Adam Powell
212db7d3f8
Added MultiSelectListPreference
...
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.
MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.
Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
2010-04-15 10:18:17 -07:00
Dan Egnor
7829f3d4b1
am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:28:29 -07:00
Dan Egnor
a28a05f31b
am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
2010-04-08 14:19:52 -07:00
Brad Fitzpatrick
3f73e4869f
am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:14:46 -07:00
Dan Egnor
2124808060
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
9c3554e997
am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Brad Fitzpatrick
a8fbedbf5e
Missed these ones in the previous rename.
...
BUG=2581935
Change-Id: I12e7fc924d7164ab4a5ff7bd6ee52a10f7551ad4
2010-04-08 14:08:54 -07:00
Robert Greenwalt
ac6ec41b67
resolved conflicts for merge of 4e33e9c1 to master
...
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Brad Fitzpatrick
228629e920
Rename logtag for clarity.
...
BUG=2581935
Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
2010-04-08 13:25:46 -07:00
Robert Greenwalt
6646cf7af9
am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Robert Greenwalt
9e696c29f0
Add service to monitor/control the flow of data.
...
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
Fred Quintana
08695a5c91
Merge "create a SyncManager WakeLock for each syncadapter accountType/authority pair so that it will be easy to tell via bugreport which sync adapter is holding the wake lock the most"
2010-04-08 10:12:43 -07:00
Suchi Amalapurapu
4baf4e6a74
am eb606ec9: am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
3e543abbc1
am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
Fix 2579461
2010-04-07 21:32:30 -07:00
Suchi Amalapurapu
40e472521a
Fix 2579461
...
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.
Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Fred Quintana
b3029c3d56
create a SyncManager WakeLock for each syncadapter
...
accountType/authority pair so that it will be easy to tell via
bugreport which sync adapter is holding the wake lock the most
http://b/issue?id=2571451
2010-04-07 14:24:58 -07:00
Ray Chen
f974b84b54
am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 13:52:52 -07:00
Dianne Hackborn
b4d32b5657
am c24a1498: am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 13:52:46 -07:00
Ray Chen
84d12f3fe7
am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
...
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:14:49 -07:00
Ray Chen
25c2dd60d4
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:05:58 -07:00
Dianne Hackborn
7aed1e14b5
am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
...
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615 : System server crashed in SyncStorageEngine
2010-04-07 11:58:21 -07:00
Dianne Hackborn
4e80820ab5
Maybe fix issue #2568615 : System server crashed in SyncStorageEngine
...
Ack, we were acquiring the wrong lock at some points when
accessing the data structure!
Change-Id: I8bbc8e1ffa2e3e8a94bf7625e3d7f020c458eea2
2010-04-07 11:14:15 -07:00
Ray Chen
b7c8c76180
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
...
http://2553871
Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
2010-04-07 10:14:04 -07:00
Dianne Hackborn
7a3a6dba21
am 5a0797a9: am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK
2010-04-05 19:02:57 -07:00
Dianne Hackborn
4931331552
am f0adaa1b: am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479 : Favorite Recipes App Installation Fail" into froyo
2010-04-05 18:53:21 -07:00
Dianne Hackborn
5a0797a910
am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK
...
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken
* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
2568467 System crash when installing corrupt APK
2010-04-05 18:52:39 -07:00
Dianne Hackborn
f0adaa1bd5
am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479 : Favorite Recipes App Installation Fail" into froyo
...
Merge commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7' into kraken
* commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7':
Fix issue #2564479 : Favorite Recipes App Installation Fail
2010-04-05 18:42:27 -07:00
Dianne Hackborn
6e52b5d768
2568467 System crash when installing corrupt APK
...
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
2010-04-05 18:37:57 -07:00
Dianne Hackborn
01f6b75baa
Merge "Fix issue #2564479 : Favorite Recipes App Installation Fail" into froyo
2010-04-05 18:35:11 -07:00
Dan Morrill
7d6eef83d3
am a03dfc07: am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
2010-04-05 15:11:02 -07:00
Dan Morrill
a03dfc0792
am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
...
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
2010-04-05 15:03:48 -07:00
Dan Morrill
b0fe033ff8
Adding a feature definition for touchscreens that was overlooked in the last
...
round.
Change-Id: I8f30676a7b468a9868503b05f366709d5534a44e
2010-04-05 14:43:58 -07:00
Dianne Hackborn
d1cff1b4a4
Fix issue #2564479 : Favorite Recipes App Installation Fail
...
Change-Id: Ide1045e3f6bef9ed2a2fee08bfeda8c58feb685f
2010-04-02 16:51:26 -07:00
Dianne Hackborn
488fd5d9c3
am 4d075b02: am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
2010-04-02 13:51:25 -07:00
Dianne Hackborn
4d075b029f
am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
...
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
2010-04-02 13:42:09 -07:00
