Commit Graph

2037 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 29544b21fb Merge "Look for product configs in device/ in addition to vendor/" 2010-02-05 07:16:34 -08:00
Doug Zongker 14833605d2 add UnmountAll function to OTA script; support radio images w/path
Three unrelated changes:

- change the add-radio-file makefile function to support adding files
  with paths.  (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
  that we can explicitly unmount everything we've mounted (in addition
  to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
  device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
2010-02-03 09:21:22 -08:00
Bjorn Bringert cd5d82afa5 Merge "Add all-logtags-files-under macro" 2010-02-03 02:51:51 -08:00
Bjorn Bringert a89c990e31 Add all-logtags-files-under macro
Change-Id: Icb4c7e1bb2dfa4df71f07cb022c92e95a9115019
2010-02-02 20:44:13 +00:00
Brett Chabot d7edf7ebb7 Add clean step for AndroidTests.
Needed because AndroidTests.java has been removed.
2010-02-02 10:49:23 -08:00
Doug Zongker 30f1d2cf29 am 20d93db1: am cdb621bf: retry patch using cache if in-place write fails
Merge commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca'

* commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca':
  retry patch using cache if in-place write fails
2010-02-02 09:38:39 -08:00
Doug Zongker 20d93db18d am cdb621bf: retry patch using cache if in-place write fails
Merge commit 'cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp

* commit 'cdb621bfea3083afbea238dbf374826742aca6d0':
  retry patch using cache if in-place write fails
2010-02-02 08:53:17 -08:00
Doug Zongker cdb621bfea retry patch using cache if in-place write fails
[cherry-pick from donut branch]

Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.

Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
2010-02-02 08:44:12 -08:00
Bjorn Bringert 76a72277c9 Generate write<TAG> methods in logtags-generated Java code
Change-Id: Iebca77f2f710ee4c15bf7089647f8d79fe79f33a
2010-02-02 10:40:06 +00:00
Brian Carlstrom 259e5b7a94 godir search should ignore .repo directory 2010-01-30 11:45:03 -08:00
Brian Carlstrom 2f091860d8 Merge "godir should set "T=$(gettop)"" 2010-01-30 11:08:21 -08:00
Brian Carlstrom b9915a6a18 godir should set "T=$(gettop)" 2010-01-29 16:39:32 -08:00
Makoto Onuki d8456ef0c8 Merge "cleanstep: remove email intermediates" 2010-01-29 16:22:29 -08:00
The Android Open Source Project cad3c092ae reconcile android-2.1_r1 snapshot 2010-01-29 14:07:32 -08:00
Makoto Onuki 8b20042a9a cleanstep: remove email intermediates 2010-01-29 13:11:09 -08:00
Sriram Raman 2fd94d1beb Remove Gallery (not 3d) from all builds on master 2010-01-29 14:33:16 -05:00
Ed Heyl b46e8a2d5c am ffae6f51: (-s ours) am 25a331ab: Merge "Update version string." into eclair
Merge commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0'

* commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0':
  Update version string.
2010-01-28 15:09:40 -08:00
Scott Main 80ec85cc47 am 5729dbfa: am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit '5729dbfa00ffb659c5758195b617af4349c0ef75'

* commit '5729dbfa00ffb659c5758195b617af4349c0ef75':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-28 15:06:03 -08:00
Raphael 5993b09194 am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
  Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-28 13:43:39 -08:00
Jesse Wilson 98647acd91 Merge "Suppress the annoying "XML missing method" warnings from the doc build." 2010-01-28 13:33:29 -08:00
Jesse Wilson b127997b14 Suppress the annoying "XML missing method" warnings from the doc build. 2010-01-28 10:50:58 -08:00
Dirk Dougherty 7260470e76 am 262e8214: am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '262e821409fbd59b593e56cb75a339e8a2364533'

* commit '262e821409fbd59b593e56cb75a339e8a2364533':
  doc change: add announce for developer lab at mwc.
2010-01-28 10:48:00 -08:00
Andreas Huber 3e51fa489a Enable stagefright's http implementation by default.
related-to-bug: 2395398
2010-01-27 14:44:39 -08:00
Suchi Amalapurapu 56a0d6596a Add DefaultContainerService to core make file 2010-01-27 14:14:56 -08:00
Ed Heyl ffae6f5127 am 25a331ab: Merge "Update version string." into eclair
Merge commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp

* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
  Update version string.
2010-01-26 15:01:17 -08:00
Scott Main 5729dbfa00 am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp

* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-26 15:01:13 -08:00
Ed Heyl 25a331ab87 Merge "Update version string." into eclair 2010-01-26 14:55:33 -08:00
Dianne Hackborn 813022b0a3 Update version string.
Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
2010-01-26 12:54:40 -08:00
Valentin Kravtsov dc4e079307 Adding clean step
Change-Id: I715681edf2d668ee9b5a483fa82af2e608285f47
2010-01-26 11:38:26 +00:00
Scott Main e6fed8807f Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair 2010-01-25 15:39:40 -08:00
Scott Main 9033c12688 docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug: 1909300
2010-01-25 15:26:10 -08:00
Doug Zongker 1c0765da03 Merge "add a .gitignore file to make git ignore *.pyc files" 2010-01-25 14:32:31 -08:00
Raphael ccd0338ce6 am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp

* commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5':
  Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-25 14:30:49 -08:00
Raphael e749b5a71a Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
2010-01-22 18:36:37 -08:00
Jean-Baptiste Queru 8d05416d61 Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
2010-01-22 15:47:57 -08:00
Dirk Dougherty 262e821409 am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp

* commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
  doc change: add announce for developer lab at mwc.
2010-01-22 14:27:55 -08:00
Dirk Dougherty 6339cfe89b Merge "doc change: add announce for developer lab at mwc." into eclair 2010-01-22 14:23:07 -08:00
Dirk Dougherty 781a636aed doc change: add announce for developer lab at mwc.
Bug: 2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
2010-01-22 13:24:55 -08:00
Doug Zongker b14c3fd119 add a .gitignore file to make git ignore *.pyc files
Change-Id: Ie8877ca9c1152681433a638a5e4d20948326f7ca
2010-01-22 10:23:45 -08:00
Scott Main a1a93b35e9 am daa3b7a4: am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a'

* commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-22 09:43:09 -08:00
android-build SharedAccount 6bc8ddcc48 clean step for JIT switch 2010-01-22 08:34:06 -08:00
Bjorn Bringert a075295acd Cleanstep to remove old QuickSearchBox.apk
Without this, BrowserProvder crashes with:

E/AndroidRuntime(  875): java.lang.RuntimeException: Unable to get provider com.android.browser.BrowserProvider: java.lang.NullPointerException
E/AndroidRuntime(  875):     at android.app.ActivityThread.installProvider(ActivityThread.java:4269)
E/AndroidRuntime(  875):     at android.app.ActivityThread.installContentProviders(ActivityThread.java:4041)
E/AndroidRuntime(  875):     at android.app.ActivityThread.handleBindApplication(ActivityThread.java:4000)
E/AndroidRuntime(  875):     at android.app.ActivityThread.access$2900(ActivityThread.java:118)
E/AndroidRuntime(  875):     at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1900)
E/AndroidRuntime(  875):     at android.os.Handler.dispatchMessage(Handler.java:99)
E/AndroidRuntime(  875):     at android.os.Looper.loop(Looper.java:123)
E/AndroidRuntime(  875):     at android.app.ActivityThread.main(ActivityThread.java:4360)
E/AndroidRuntime(  875):     at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime(  875):     at java.lang.reflect.Method.invoke(Method.java:521)
E/AndroidRuntime(  875):     at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
E/AndroidRuntime(  875):     at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
E/AndroidRuntime(  875):     at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime(  875): Caused by: java.lang.NullPointerException
E/AndroidRuntime(  875):     at android.os.Parcel.readException(Parcel.java:1224)
E/AndroidRuntime(  875):     at android.os.Parcel.readException(Parcel.java:1206)
E/AndroidRuntime(  875):     at android.app.ISearchManager$Stub$Proxy.getSearchableInfo(ISearchManager.java:220)
E/AndroidRuntime(  875):     at android.app.SearchManager.getSearchableInfo(SearchManager.java:2056)
E/AndroidRuntime(  875):     at com.android.browser.BrowserProvider.updateShowWebSuggestions(BrowserProvider.java:410)
E/AndroidRuntime(  875):     at com.android.browser.BrowserProvider.onCreate(BrowserProvider.java:363)
E/AndroidRuntime(  875):     at android.content.ContentProvider.attachInfo(ContentProvider.java:725)
E/AndroidRuntime(  875):     at android.app.ActivityThread.installProvider(ActivityThread.java:4266)
E/AndroidRuntime(  875):     ... 12 more

which is a result of an earlier problem in Searchables:

01-19 11:58:46.317 E/AndroidRuntime(  416): java.lang.RuntimeException: Unable to start receiver com.android.quicksearchbox.SearchWidgetProvider: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.app.ActivityThread.handleReceiver(ActivityThread.java:2645)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.app.ActivityThread.access$3100(ActivityThread.java:118)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1912)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.os.Handler.dispatchMessage(Handler.java:99)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.os.Looper.loop(Looper.java:123)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at android.app.ActivityThread.main(ActivityThread.java:4360)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at java.lang.reflect.Method.invokeNative(Native Method)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at java.lang.reflect.Method.invoke(Method.java:521)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
01-19 11:58:46.317 E/AndroidRuntime(  416): 				at dalvik.system.NativeStart.main(Native Method)
01-19 11:58:46.317 E/AndroidRuntime(  416): Caused by: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.os.Parcel.readException(Parcel.java:1218)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.os.Parcel.readException(Parcel.java:1206)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.app.ISearchManager$Stub$Proxy.getSearchablesInGlobalSearch(ISearchManager.java:242)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.app.SearchManager.getSearchablesInGlobalSearch(SearchManager.java:2152)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.Sources.addExternalSources(Sources.java:275)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.Sources.updateSources(Sources.java:266)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.Sources.load(Sources.java:235)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.QsbApplication.createSources(QsbApplication.java:96)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.QsbApplication.getSources(QsbApplication.java:89)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.SearchWidgetProvider.getSources(SearchWidgetProvider.java:222)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.SearchWidgetProvider.bindSourceSelector(SearchWidgetProvider.java:162)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.SearchWidgetProvider.updateSearchWidgets(SearchWidgetProvider.java:105)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.SearchWidgetProvider.onUpdate(SearchWidgetProvider.java:90)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.appwidget.AppWidgetProvider.onReceive(AppWidgetProvider.java:61)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at com.android.quicksearchbox.SearchWidgetProvider.onReceive(SearchWidgetProvider.java:84)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   at android.app.ActivityThread.handleReceiver(ActivityThread.java:2636)
01-19 11:58:46.317 E/AndroidRuntime(  416): 	   ... 10 more

Change-Id: I66eff8d571a40a6d724c49c258a49ba9d5c18f9f
2010-01-19 20:10:32 +00:00
Bjorn Bringert ae80fb3ee1 Merge "Don't build GoogleSearch" 2010-01-19 11:19:44 -08:00
Scott Main daa3b7a469 am 945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp

* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
  docs: add the ability to exclude PRE elements from being prettified
2010-01-19 11:13:44 -08:00
Scott Main 945ed36ec4 docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
2010-01-19 10:59:16 -08:00
Bjorn Bringert 1069918863 Don't build GoogleSearch
GoogleSearch is being replaced by QuickSearchBox, which
includes Google search.

Change-Id: Ief2d1136b8977b0fc6e2b5d97221e5c0bc620daf
2010-01-18 22:11:36 +00:00
Joe Onorato ee869c00e9 cleanspec for the google_voiceime generated files. 2010-01-15 18:23:46 -05:00
Jeff Hamilton 7933a756c5 Fix the build. 2010-01-14 14:37:37 -06:00
Bjorn Bringert a7ab17d0a3 Allow multiple directories in LOCAL_RESOURCE_DIR
Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.

This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.

I've verified that this now works:

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res

Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf
2010-01-14 17:55:30 +00:00
Scott Main 923d541486 am 4bd6c862: am 3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '4bd6c862f0897f99abc227611822e1dace03b6e0'

* commit '4bd6c862f0897f99abc227611822e1dace03b6e0':
  docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 12:17:08 -08:00