Commit Graph

16870 Commits

Author SHA1 Message Date
Mathias Agopian
6ec72e3fa9 Merge commit 'goog/master' into merge_master 2009-05-08 13:13:12 -07:00
Dianne Hackborn
55280a9188 Improve shutdown process to send broadcast for applications.
This introduces a new class in the base platform for performing a clean
shutdown (which was copied from the classes in the policies).  It
includes new features to send a shutdown broadcast for applications
to do cleanup, and ot have the activity manager pause the current
activity before proceeding with the shutdown.  These facilities are
also use to write at the most recent stat files for sync, battery
and user activity.
2009-05-08 12:59:21 -07:00
Android (Google) Code Review
3cf650dec4 am 672f1e2: Merge change 1192 into donut
Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'

* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 12:25:06 -07:00
The Android Open Source Project
8ca7d85d82 manual merge 3a6645a
Merge commit '3a6645a'
2009-05-08 12:16:40 -07:00
Android (Google) Code Review
672f1e2b07 Merge change 1192 into donut
* changes:
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 11:41:47 -07:00
Android (Google) Code Review
3a6645a1cb Merge change 1114 into donut
* changes:
  Fix keyboard redraw bug on long-press of CapsLock.
2009-05-08 11:31:03 -07:00
Android (Google) Code Review
17f9599fd6 am 17a5e5d: Merge change 1217 into donut
Merge commit '17a5e5de3d864842b723efe24650863db0656a14'

* commit '17a5e5de3d864842b723efe24650863db0656a14':
  Sketch out the IBackupTransport api
2009-05-08 11:12:34 -07:00
Android (Google) Code Review
17a5e5de3d Merge change 1217 into donut
* changes:
  Sketch out the IBackupTransport api
2009-05-08 11:10:34 -07:00
Amith Yamasani
f04da95400 Fix keyboard redraw bug on long-press of CapsLock.
Expose invalidateKey and invalidateAllKeys for subclasses to call when needed.
2009-05-08 10:34:39 -07:00
The Android Open Source Project
cb4a3f36df am 60f3eb5: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'

* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
  Define the URI path, columns and constants for shortcut validation.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
59e3c94860 am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'

* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
  Require native-order direct buffers for glXXXPointer APIs.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
3d73eeb7b3 am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'

* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
  * update density correctly when the configuration is changed.
2009-05-08 07:22:44 -07:00
The Android Open Source Project
1471c8f6a7 am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e'

* commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e':
  don't use modulo
2009-05-08 07:22:44 -07:00
The Android Open Source Project
c11dbe782d am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'

* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
  Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
1a36071092 manual merge of 7ec32cc
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
djken
b80676747d The comment lack of symbol # and parameter data type. This will cause compilation failed. 2009-05-08 07:07:55 -04:00
Karl Rosaen
b2a5011578 Define the URI path, columns and constants for shortcut validation. 2009-05-07 18:37:11 -07:00
Jack Palevich
e20ea783a1 Require native-order direct buffers for glXXXPointer APIs.
This was always a documented restriction, but was not enforced by the runtime until now.

Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.

Now we throw an exception rather than leaving the system in a potentially bad state.
2009-05-07 18:28:29 -07:00
Mathias Agopian
6bebbcd57b Merge commit 'goog/master' into merge_master 2009-05-07 17:46:45 -07:00
Android (Google) Code Review
881c4c25f1 Merge change 1108 into donut
* changes:
  * update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-07 17:39:57 -07:00
Android (Google) Code Review
07d7521376 Merge change 760 into donut
* changes:
  don't use modulo
2009-05-07 17:23:51 -07:00
Christopher Tate
e10be80787 Sketch out the IBackupTransport api 2009-05-07 17:22:16 -07:00
Mitsuru Oshima
d4cc32ca99 don't use modulo 2009-05-07 17:02:27 -07:00
Android (Google) Code Review
2108e5c74f Merge change 1163 into donut
* changes:
  Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
Joe Onorato
b1a7ffef3a More backup tests 2009-05-07 15:32:48 -07:00
Brandon Ballinger
e1a085801d am fedf566: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'

* commit 'fedf566b9e00f18588fc104caafd047af069844a':
  AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
2009-05-07 14:30:13 -07:00
Brandon Ballinger
fedf566b9e Merge branch 'readonly-p4-donut' into donut 2009-05-07 14:26:17 -07:00
Brandon Ballinger
cdd0ac6d85 AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
(2) Return error strings to client rather than error types.

Automated import of CL 148484
2009-05-07 14:24:02 -07:00
Robert Greenwalt
704e00ab7b Fix 1825581 - device restarts when using A2DP.
Had to do with using the wrong JNIEnv.  Now storing the VM and looking up a
JNIEnv appropriate to the thread as needed.
2009-05-07 14:09:29 -07:00
Jack Palevich
be509c9c7d Fix automatically generated code for glGet
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
2009-05-07 10:52:18 -07:00
Android (Google) Code Review
5bd1d84aa8 am 90da134: Merge change 1065 into donut
Merge commit '90da134befec804852775be7fd4905a1a188ff00'

* commit '90da134befec804852775be7fd4905a1a188ff00':
  Add a contact placeholder picture.
2009-05-07 01:07:37 -07:00
Android (Google) Code Review
90da134bef Merge change 1065 into donut
* changes:
  Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
The Android Open Source Project
cfe5cdd3a1 manual merge d90a331 to avoid conflicts
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Android (Google) Code Review
8dd6de8050 Merge change 1109
* changes:
  Another fix: look at db version to determine if there is a type column.
2009-05-06 17:21:57 -07:00
Romain Guy
d90a33111b Add new setTag(int, Object) API to allow applications to specify several tags. 2009-05-06 16:49:56 -07:00
Mitsuru Oshima
2e3d3b9ce7 * update density correctly when the configuration is changed.
* Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-06 16:42:11 -07:00
Android (Google) Code Review
77066048f4 am 413cf5f: Merge change 1110 into donut
Merge commit '413cf5f4536b9c029d07f99b1c769c026313cd12'

* commit '413cf5f4536b9c029d07f99b1c769c026313cd12':
  Track install/removal/update of packages that provide backup services
2009-05-06 16:18:45 -07:00
Android (Google) Code Review
413cf5f453 Merge change 1110 into donut
* changes:
  Track install/removal/update of packages that provide backup services
2009-05-06 16:15:21 -07:00
Christopher Tate
3799bc241b Track install/removal/update of packages that provide backup services 2009-05-06 16:13:56 -07:00
Android (Google) Code Review
34f97460bd am f2331a6: Merge change 1063 into donut
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
6ea036760f am f759824: Merge change 1086 into donut
Merge commit 'f7598245489c6d28c2673acd269ada2e6e834065'

* commit 'f7598245489c6d28c2673acd269ada2e6e834065':
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 15:49:00 -07:00
Christopher Tate
959a4bcc46 am b1d790b: Pass null as savedState to indicate a full backup is require
Merge commit 'b1d790b63e2115be558d451efbc914d1f8dfa846'

* commit 'b1d790b63e2115be558d451efbc914d1f8dfa846':
  Pass null as savedState to indicate a full backup is required
2009-05-06 15:49:00 -07:00
Android (Google) Code Review
37dbf09917 am 9a6f250: Merge change 1089 into donut
Merge commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c'

* commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c':
  Add a Backup Manager interface to request a full backup
2009-05-06 15:48:59 -07:00
Dianne Hackborn
2d5ed1fa3d Another fix: look at db version to determine if there is a type column. 2009-05-06 15:22:38 -07:00
Android (Google) Code Review
f2331a63c0 Merge change 1063 into donut
* changes:
  Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00
Android (Google) Code Review
f759824548 Merge change 1086 into donut
* changes:
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 12:45:16 -07:00
Christopher Tate
b1d790b63e Pass null as savedState to indicate a full backup is required 2009-05-06 12:38:21 -07:00
Christopher Tate
4675812386 Add a Backup Manager interface to request a full backup
Given a package name, the Backup Manager schedules a *full* (i.e. non-
incremental) backup pass for that package.  Also added the state-file
handling for distinguishing to the target between the full and incremental
backup requests.
2009-05-06 11:24:27 -07:00
Romain Guy
e5b7632e5b Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map. 2009-05-06 11:12:38 -07:00
Dianne Hackborn
534032610c Fix [Issue 1835218]
IllegalStateException already initialized in SyncStorageEngine.init
I used the wrong column name for the new account type.
2009-05-06 10:53:37 -07:00