Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
0cee40e2bb Merge change 219 
* changes:
  Fix a null pointer exception in DumpRenderTree (issue 1792567)
 2009-04-16 11:11:14 -07:00
Robert Greenwalt
881b9cbb4f Merge branch 'readonly-p4-master' 2009-04-16 11:07:25 -07:00
Robert Greenwalt
a6872ae008 AI 146502: am: CL 145995 am: CL 145993 Fix Phone-oriented default-locale selection. 
When several locales for a given language are available we were always
  selecting the first.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146502
 2009-04-16 11:06:10 -07:00
Feng Qian
be42388bdb Fix a null pointer exception in DumpRenderTree (issue 1792567) 
The first test causes NullPointerException in DumpRenderTree because dumpAsText
could return a null string.
 2009-04-16 11:04:21 -07:00
Eric Fischer
afa2add8ba AI 146517: Import translation changes. 
DO NOT MERGE

Automated import of CL 146517
 2009-04-16 11:01:05 -07:00
Ramanan Rajeswaran
8ad51f93b5 Merge branch 'readonly-p4-master' 2009-04-16 10:49:44 -07:00
Ramanan Rajeswaran
d3d7817268 AI 146488: am: CL 145981 am: CL 145892 Add Ireland, Switzerland, New Zealand, South Africa to MccTable 
Original author: ramanan
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146488
 2009-04-16 10:47:33 -07:00
Guang Zhu
025950db01 update onCreate method to work around InstrumentationTestRunner limitation. 2009-04-16 10:41:27 -07:00
Guang Zhu
4722251d93 Removing unused StreamPipe class, also stripping some white spaces 2009-04-16 10:25:54 -07:00
Guang Zhu
23a4e88162 * Update the way that run_page_cycler.py detectes instrumentation failures. 
* Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
 2009-04-16 10:21:06 -07:00
Android (Google) Code Review
7a430cf152 Merge change 195 
* changes:
  Make webkit's cursor draw at the correct times.
 2009-04-16 06:21:10 -07:00
Android (Google) Code Review
e2945e2d69 Merge change 187 into donut 
* changes:
  replaced integer * and % with shift operations, for performance
 2009-04-16 00:05:57 -07:00
Tammo Spalink
e564b19ed2 replaced integer * and % with shift operations, for performance 2009-04-16 14:48:19 +08:00
Xavier Ducrohet
9d1eced4a8 AI 146411: Fix BridgeCanvas#drawRoundRect 
BUG=1792311

Automated import of CL 146411
 2009-04-15 22:30:00 -07:00
Mathias Agopian
a6b40ba521 fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off. 
Squashed commit of the following:

commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 18:30:30 2009 -0700

    fix and improve BufferMapper's tracking of mapped buffers.

commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Apr 15 00:52:02 2009 -0700

    fix some bugs with the Singleton<> class. untested.

commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date:   Tue Apr 14 19:29:25 2009 -0700

    some work to debug the Singleton<> template.
 2009-04-15 18:34:24 -07:00
Eric Fischer
c56eed910a AI 146365: Import revised translations. 
DO NOT MERGE

Automated import of CL 146365
 2009-04-15 13:30:18 -07:00
Android (Google) Code Review
a6c6f06b07 Merge change 186 into donut 
* changes:
  eliminate seemingly pointless conversion to and then from hex string
 2009-04-15 12:13:07 -07:00
Dirk Dougherty
7cf6fa727a Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:35:03 -07:00
Dirk Dougherty
2fd2f6e5c6 AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change) 
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146345
 2009-04-15 11:33:48 -07:00
Dirk Dougherty
e9a65c3a4a Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:32:07 -07:00
Dirk Dougherty
adb538b52f AI 146343: am: CL 146340 Integrate updated SDK Terms and Conditions document 
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146343
 2009-04-15 11:30:46 -07:00
Dirk Dougherty
d9671b8e05 AI 146341: g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change) 
BUG=1675368

Automated import of CL 146341
 2009-04-15 11:29:53 -07:00
Dirk Dougherty
b01b0cb4b6 AI 146340: Integrate updated SDK Terms and Conditions document 
Automated import of CL 146340
 2009-04-15 11:28:57 -07:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times. 
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
 2009-04-15 13:25:00 -04:00
Android (Google) Code Review
f5bfda1fce Merge change 190 into donut 
* changes:
  location: Move geocoding support from ILocationProvider to a new interface.
 2009-04-15 08:21:40 -07:00
Mike Lockwood
a55c321329 location: Move geocoding support from ILocationProvider to a new interface. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-15 11:17:37 -04:00
Eric Shienbrood
bdacd87562 Merge branch 'readonly-p4-master' 2009-04-15 06:59:53 -07:00
Eric Shienbrood
674dfebd81 AI 146316: Get build working by fixing manual merge that I messed up. 
Automated import of CL 146316
 2009-04-15 06:58:36 -07:00
Android (Google) Code Review
a2180c6eee Merge change 174 into donut 
* changes:
  Improve glgen
 2009-04-15 06:14:11 -07:00
Tammo Spalink
e87e9506ba eliminate seemingly pointless conversion to and then from hex string 2009-04-15 18:50:38 +08:00
Android (Google) Code Review
967f7c169c Merge change 175 into donut 
* changes:
  telephony: Don't disable an APN type that is not enabled.
 2009-04-14 20:19:42 -07:00
Mike Lockwood
d90ff986b4 telephony: Don't disable an APN type that is not enabled. 
Fixes a bad interaction between MMS and SUPL that occurs when they are using
the same APN.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 22:35:07 -04:00
Jack Palevich
4e70a9e462 Improve glgen 
+ gen script is really a bash script rather than a sh script,
  so declare that to be true. (For example, it uses pushd,
  which is a part of bash, but not a part of sh. Not sure
  how this worked until now. Possibly gen was only run in
  environments where /bin/sh was really bash.

+ Check the results of the java compile of the code generator,
  and abort the script if the compile fails.

+ Turn on the bash shell option that guards against using
  uninitialized variables in the script.

+ Remove the generated class files.

Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
 2009-04-14 19:00:09 -07:00
The Android Open Source Project
66db122106 Merge commit 'korg/cupcake' 2009-04-14 18:18:15 -07:00
The Android Open Source Project
5e8c31ac31 Merge commit 'korg/cupcake' 2009-04-14 18:18:03 -07:00
Scott Main
c12801e1ed Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:23:06 -07:00
Scott Main
135d233540 AI 146255: am: CL 146254 clarification for the minSdkVersion attribute; 
added more information to the <uses-sdk> reference,
  added a link to it from the <manifes> reference, and
  revised some misleading information in the android 1.1 version notes
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146255
 2009-04-14 17:21:49 -07:00
Scott Main
0ebf34a27a AI 146254: clarification for the minSdkVersion attribute; 
added more information to the <uses-sdk> reference,
  added a link to it from the <manifes> reference, and
  revised some misleading information in the android 1.1 version notes
  BUG=1788684

Automated import of CL 146254
 2009-04-14 17:19:13 -07:00
Scott Main
fb9edfd165 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:02:10 -07:00
Scott Main
63c4120e33 AI 146251: am: CL 146242 fix the package namespace in the examples; 
delete the old hello-android file
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146251
 2009-04-14 17:00:51 -07:00
Guang Zhu
17b8ca48ab Merge branch 'readonly-p4-donut' into donut 2009-04-14 16:47:03 -07:00
Guang Zhu
e6f63b1a15 AI 146246: am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Original author: guangzhu
  Merged from: //branches/cupcake/...

Automated import of CL 146246
 2009-04-14 16:45:47 -07:00
Scott Main
a9fe9e21d3 AI 146242: fix the package namespace in the examples; 
delete the old hello-android file
  BUG=1750212

Automated import of CL 146242
 2009-04-14 16:29:14 -07:00
Guang Zhu
7fc3cd6aeb AI 146225: Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Automated import of CL 146225
 2009-04-14 15:49:35 -07:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master. 
Automated import of CL 146222
 2009-04-14 15:40:20 -07:00
Mathias Agopian
5f105d38e2 Merge commit 'goog/master' into merge_master 2009-04-14 15:21:33 -07:00
Mathias Agopian
032c85d636 Merge commit 'goog/master_gl' into merge_master 2009-04-14 14:56:34 -07:00
Mathias Agopian
85d7a06826 Merge commit 'goog/master' into merge_master 2009-04-14 14:45:37 -07:00
Android (Google) Code Review
e2393c5792 Merge changes 108,130,131 into donut 
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
 2009-04-14 14:40:02 -07:00