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

1662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joe Onorato
7e38146b84 am c825d3e: fix the sim build. disables the tests for now. 
Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'

* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
  fix the sim build.  disables the tests for now.
 2009-05-08 09:35:32 -07:00
Joe Onorato
c825d3ebd6 fix the sim build. disables the tests for now. 2009-05-08 09:33:19 -07:00
The Android Open Source Project
ac1514c5b0 manual merge of 1e09a72 
Merge commit '1e09a72'
 2009-05-08 07:23:54 -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
ec91aab3be am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 
Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'

* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
  Add new binder methods to camera client to support generic callbacks
 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
The Android Open Source Project
aec09d7ea9 am 5085ef6: Merge branch \'donut\' of ssh://android-git.corp.google.com:29 
Merge commit '5085ef64ac3e589b1674dddcb6dabe3600e347da'

* commit '5085ef64ac3e589b1674dddcb6dabe3600e347da':
 2009-05-08 00:54:55 -07:00
Scott Main
5862e9fc9f am b6868d0: am 9b825aa: AI 148470: add documentation about aapt image op 
Merge commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4'

* commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4':
  AI 148470: add documentation about aapt image optimization
 2009-05-08 00:54:53 -07:00
The Android Open Source Project
1e09a72a75 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:56:43 -07:00
Jeff Hamilton
b890889267 Fix the build. 
There was an issue with current.xml from a previous backup related change. Joe blames the stage.
 2009-05-07 18:52:53 -07:00
The Android Open Source Project
60f3eb54a0 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:49:48 -07:00
Karl Rosaen
b2a5011578 Define the URI path, columns and constants for shortcut validation. 2009-05-07 18:37:11 -07:00
The Android Open Source Project
b59f23d4de Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:34: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
The Android Open Source Project
3fd7e13960 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:51:28 -07:00
Android (Google) Code Review
538bcd702c Merge change 1164 into donut 
* changes:
  Add new binder methods to camera client to support generic callbacks This is the first step in a multi-step change to move from the old specific callbacks to a generic callback. This will allow future flexibility in the interface without requiring binder rewrites. Bug 1837832
 2009-05-07 17:47:54 -07:00
The Android Open Source Project
8705a41a77 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:40:33 -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
The Android Open Source Project
c664d1837c Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:25:17 -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
The Android Open Source Project
572ae14f6e Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:04:14 -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
The Android Open Source Project
7ec32cc7c3 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 16:45:46 -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
The Android Open Source Project
5085ef64ac Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 14:28:57 -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
Dave Sparks
2a04aefdf0 Add new binder methods to camera client to support generic callbacks 
This is the first step in a multi-step change to move from the old
specific callbacks to a generic callback. This will allow future
flexibility in the interface without requiring binder rewrites.
Bug 1837832
 2009-05-07 12:25:25 -07:00
Scott Main
b6868d0048 am 9b825aa: AI 148470: add documentation about aapt image optimization 
Merge commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093' into donut

* commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093':
  AI 148470: add documentation about aapt image optimization
 2009-05-07 12:00:28 -07:00
Scott Main
9b825aa0ee AI 148470: add documentation about aapt image optimization 
BUG=1735176

Automated import of CL 148470
 2009-05-07 11:59:14 -07:00
Android (Google) Code Review
30f91d6e10 am b85c374: Merge change 1155 into donut 
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
  Don't allow negative numbers in ToneGenerator toneType parameter
 2009-05-07 11:54:50 -07:00
Android (Google) Code Review
b85c37432b Merge change 1155 into donut 
* changes:
  Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
 2009-05-07 11:52:06 -07:00
Dirk Dougherty
9cfd9475ee am e87bf13: am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update 
Merge commit 'e87bf13924199225d2751ae7b4d0451954ee3711'

* commit 'e87bf13924199225d2751ae7b4d0451954ee3711':
  AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
 2009-05-07 11:20:43 -07:00
Dirk Dougherty
e87bf13924 am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update ADT version 
Merge commit '1f8059f19f3345042121a55481d7f01dacc8d29e' into donut

* commit '1f8059f19f3345042121a55481d7f01dacc8d29e':
  AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
 2009-05-07 11:18:35 -07:00
Dirk Dougherty
97774e15e3 am 2a50606: am f096acd: AI 148460: Misc changes for dev site. 
Merge commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8'

* commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8':
  AI 148460: Misc changes for dev site.
 2009-05-07 11:16:55 -07:00