Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ecea8011a3 am cbf77e9b: Merge change I875200fe into eclair 
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-plus-aosp

* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
  Another fix for #2186897: Cannot unlock the device by swiping
 2009-10-13 23:00:28 -07:00
Android (Google) Code Review
cbf77e9bef Merge change I875200fe into eclair 
* changes:
  Another fix for #2186897: Cannot unlock the device by swiping
 2009-10-14 01:51:00 -04:00
Dianne Hackborn
f2ddfb1528 Another fix for #2186897: Cannot unlock the device by swiping 
This was probably a side-effect of the divide by zero exception,
but we'll be safe anyway.

Change-Id: I875200febb9b3090d12f170066b2bea74c9f77f8
 2009-10-13 22:47:02 -07:00
Dianne Hackborn
03d0230bdf am f6d6d180: am 126ac7f9: am b10e2f1a: Merge change Iac534225 into eclair 
Merge commit 'f6d6d180f8c2bec2b152e5dbf74a0c8aec3ec8ee'

* commit 'f6d6d180f8c2bec2b152e5dbf74a0c8aec3ec8ee':
  Fix issue #2186709: Can't unlock the device for a while
 2009-10-13 20:37:01 -07:00
Dianne Hackborn
f6d6d180f8 am 126ac7f9: am b10e2f1a: Merge change Iac534225 into eclair 
Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp

* commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95':
  Fix issue #2186709: Can't unlock the device for a while
 2009-10-13 20:28:32 -07:00
Dianne Hackborn
4b6651b9c2 am b10e2f1a: Merge change Iac534225 into eclair 
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while
 2009-10-13 20:21:11 -07:00
Dianne Hackborn
126ac7f9f9 am b10e2f1a: Merge change Iac534225 into eclair 
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while
 2009-10-13 20:19:39 -07:00
Android (Google) Code Review
b10e2f1a86 Merge change Iac534225 into eclair 
* changes:
  Fix issue #2186709: Can't unlock the device for a while
 2009-10-13 23:13:37 -04:00
Jack Palevich
a0fb8eb138 am 09e7ef8a: am a5bfe52d: Merge change Ib3558f35 into eclair-mr2 
Merge commit '09e7ef8aadb480349e9f63dcab155cb466296e92'

* commit '09e7ef8aadb480349e9f63dcab155cb466296e92':
  Make our choice of surface explicit.
 2009-10-13 20:10:19 -07:00
Jack Palevich
86a19b3d2c am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2 
Merge commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef'

* commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef':
  Add additional error checking of EGL function calls.
 2009-10-13 20:10:10 -07:00
Dmitri Plotnikov
8f26c13e59 am 767741ff: am 0741c134: am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'

* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 20:10:00 -07:00
Jack Palevich
09e7ef8aad am a5bfe52d: Merge change Ib3558f35 into eclair-mr2 
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp

* commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876':
  Make our choice of surface explicit.
 2009-10-13 20:00:58 -07:00
Jack Palevich
70d12dda7c am 3743559d: Merge change I28023911 into eclair-mr2 
Merge commit '3743559db03645ef7d319c0344238c335a315b65' into eclair-mr2-plus-aosp

* commit '3743559db03645ef7d319c0344238c335a315b65':
  Add additional error checking of EGL function calls.
 2009-10-13 20:00:51 -07:00
Dmitri Plotnikov
767741ffd5 am 0741c134: am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '0741c134645300fed9ad13760273c8d245a04e63' into eclair-mr2-plus-aosp

* commit '0741c134645300fed9ad13760273c8d245a04e63':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 20:00:44 -07:00
Android (Google) Code Review
a5bfe52d9e Merge change Ib3558f35 into eclair-mr2 
* changes:
  Make our choice of surface explicit.
 2009-10-13 22:54:58 -04:00
Android (Google) Code Review
3743559db0 Merge change I28023911 into eclair-mr2 
* changes:
  Add additional error checking of EGL function calls.
 2009-10-13 22:54:15 -04:00
Jack Palevich
b3558f3526 Make our choice of surface explicit. 2009-10-13 19:52:44 -07:00
Jack Palevich
28023911a4 Add additional error checking of EGL function calls. 2009-10-13 19:52:06 -07:00
Dianne Hackborn
53cd579459 Fix issue #2186709: Can't unlock the device for a while 
Change-Id: Iac5342254036cc286ad502dba943520f55ea2405
 2009-10-13 19:50:51 -07:00
The Android Open Source Project
f0e697839a Merge branch 'eclair' into eclair-release 2009-10-13 19:27:06 -07:00
Dmitri Plotnikov
7a2d9a84f1 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 18:47:56 -07:00
Dmitri Plotnikov
0741c13464 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 18:47:40 -07:00
Dmitri Plotnikov
6e144ad885 Making new Contacts APIs visible in Eclair SDK 
Bug: http://b/2186595
 
Change-Id: Iaba8514276299504af6ab0714577eb37d9608237
 2009-10-13 18:24:08 -07:00
Jack Palevich
ef79172c55 am 98a51b86: am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2 
Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85'

* commit '98a51b86869e9cf2a1624f8540c4c126962a3a85':
  Allow multiple OpenGL contexts on systems that support them.
 2009-10-13 18:20:28 -07:00
Jeff Sharkey
4ec6378566 am a788f098: am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52'

* commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52':
  Correct non-opaque list separator assets.
 2009-10-13 18:20:20 -07:00
Dan Egnor
9b2ac4f854 am eac70503: am 5c8a80b8: Merge change I4410ec8f into eclair-mr2 
Merge commit 'eac70503c27104117f42de405cd5bd73579096be'

* commit 'eac70503c27104117f42de405cd5bd73579096be':
  Framework-side DropBox service that maintains a size-bounded
 2009-10-13 18:20:11 -07:00
Jack Palevich
98a51b8686 am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2 
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.
 2009-10-13 18:14:51 -07:00
Jeff Sharkey
a788f09894 am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp

* commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31':
  Correct non-opaque list separator assets.
 2009-10-13 18:14:44 -07:00
Dan Egnor
eac70503c2 am 5c8a80b8: Merge change I4410ec8f into eclair-mr2 
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp

* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
  Framework-side DropBox service that maintains a size-bounded
 2009-10-13 18:14:37 -07:00
Android (Google) Code Review
3b7a1e6d70 Merge change Ic52ba78c into eclair-mr2 
* changes:
  Allow multiple OpenGL contexts on systems that support them.
 2009-10-13 21:08:17 -04:00
Jean-Baptiste Queru
35eae22a1d Merge from donut 2009-10-13 18:07:12 -07:00
Jeff Sharkey
f032c5a25d am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-plus-aosp

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
 2009-10-13 18:05:48 -07:00
Jeff Sharkey
7d776dbbc5 am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
 2009-10-13 18:05:48 -07:00
Android (Google) Code Review
5c8a80b8fc Merge change I4410ec8f into eclair-mr2 
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
 2009-10-13 21:01:26 -04:00
Jack Palevich
c52ba78cab Allow multiple OpenGL contexts on systems that support them. 
Previously we always restricted the number of OpenGL contexts to 1.
 2009-10-13 17:58:47 -07:00
Dan Egnor
4410ec8f7c Framework-side DropBox service that maintains a size-bounded 
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
 2009-10-13 17:36:19 -07:00
Eric Fischer
214036a9df am d3ee3b7e: (-s ours) am bd6c80f6: Import revised translations. DO NOT MERGE 
Merge commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448'

* commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448':
  Import revised translations.  DO NOT MERGE
 2009-10-13 17:18:05 -07:00
Jack Palevich
2f37ac9677 am 65cc9418: am 332c7934: Merge change I69e21f5f into eclair-mr2 
Merge commit '65cc9418af489bd98f3417f165b6837656383a1c'

* commit '65cc9418af489bd98f3417f165b6837656383a1c':
  GLDual test application.
 2009-10-13 17:11:22 -07:00
Doug Zongker
33ce433ac2 am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2 
Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'

* commit 'a973eaea4597d819671c5caab8feed442e9a1af5':
  make erase-password-on-SIM-change optional
 2009-10-13 17:11:12 -07:00
Robert Greenwalt
638b1ca07c am 317d1c9e: am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair 
Merge commit '317d1c9e975c729d399406ec697ce0c863826bb6'

* commit '317d1c9e975c729d399406ec697ce0c863826bb6':
  Futher reduce the logging of EriManager.
 2009-10-13 17:10:48 -07:00
Doug Zongker
98d233606a am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2 
Merge commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a'

* commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a':
  add "junk path" -k option to aapt
 2009-10-13 17:10:01 -07:00
Ken Shirriff
d8f81c3bb7 am 947c45b2: am b10036b3: Merge change Iaa321588 into eclair-mr2 
Merge commit '947c45b29586b64c358b7824881d98faa8733ba8'

* commit '947c45b29586b64c358b7824881d98faa8733ba8':
  Add "deleted" row to Events table.
 2009-10-13 17:09:44 -07:00
Leon Scroggins
1837bfe8ad am 7fd752af: am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2 
Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'

* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
  Prevent getFile from copying when the file is too large.
 2009-10-13 17:09:07 -07:00
Eric Fischer
d3ee3b7e2b am bd6c80f6: Import revised translations. DO NOT MERGE 
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp

* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
  Import revised translations.  DO NOT MERGE
 2009-10-13 17:09:00 -07:00
Dianne Hackborn
98b23a7a82 am 80f518b7: am d34f3994: am 2a21a77d: Merge change I1369e9ab into eclair 
Merge commit '80f518b74d9ffa1e86ab8e5dc66723c0544901ca'

* commit '80f518b74d9ffa1e86ab8e5dc66723c0544901ca':
  Work on issue #2144454: Inconsistent swipes...
 2009-10-13 17:08:49 -07:00
Derek Sollenberger
6ffcd512b4 am b4b5f2af: am 14592861: Merge change I3dafca18 into eclair-mr2 
Merge commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d'

* commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d':
  Enabling plugin surfaces to update their position in the UI.
 2009-10-13 17:08:40 -07:00
Ray Chen
7ebee2f9e7 am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2 
Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'

* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
  Check cursor and URI value for nullity to prevent NPE.
 2009-10-13 17:08:01 -07:00
Andreas Huber
c69cfdbace am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2 
Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3'

* commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3':
  Separated private from public header files.
 2009-10-13 17:07:48 -07:00
Andreas Huber
ee19004b46 am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2 
Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'

* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
  Fix various compiler warnings accumulated over time.
 2009-10-13 17:07:37 -07:00
Robert Greenwalt
b9f45de523 am 00f166de: am ceabc645: am 16cb04ab: Merge change If1acb2dd into eclair 
Merge commit '00f166dedca88a781e7a64c07a42451a213f04ed'

* commit '00f166dedca88a781e7a64c07a42451a213f04ed':
  Add a little logging to diagnose wifi cycle bug
 2009-10-13 17:07:01 -07:00