24922 Commits

Author SHA1 Message Date
The Android Open Source Project
0637db6c8d merge from open-source master
Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb
2010-07-16 13:47:19 -07:00
The Android Open Source Project
4248d5887b merge from open-source master
Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
2010-07-16 13:42:31 -07:00
Jamie Gennis
5ee65f0d44 Re-use existing Surface objects when reading them from parcels.
This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used.  This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance.  This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.

Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
2010-07-16 13:03:15 -07:00
Yu Shan Emily Lau
ba1348e3c2 Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
2010-07-16 12:00:30 -07:00
Jeff Brown
f7adbe10c2 am eec69d29: Merge "Fix bug with phantom input windows." into gingerbread
Merge commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp

* commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736':
  Fix bug with phantom input windows.
2010-07-16 00:16:09 -07:00
Jeff Brown
eec69d2923 Merge "Fix bug with phantom input windows." into gingerbread 2010-07-16 00:14:38 -07:00
Eric Laurent
f16b3f104f am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp

* commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
  Several improvements in audio effects volume control.
2010-07-16 00:12:02 -07:00
Eric Laurent
b0374a0e22 Merge "Several improvements in audio effects volume control." into gingerbread 2010-07-16 00:08:50 -07:00
Jeff Brown
e33348ba54 Fix bug with phantom input windows.
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
2010-07-16 00:02:48 -07:00
Kenny Root
f97b21b54e am bd623daf: Undo IMediaContainerService changes
Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp

* commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a':
  Undo IMediaContainerService changes
2010-07-15 22:37:06 -07:00
Dianne Hackborn
9c37e5add9 am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread
Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
  Implement native key pre-dispatching to IMEs.
2010-07-15 22:24:53 -07:00
Kenny Root
bd623daff1 Undo IMediaContainerService changes
These should be in the next commit and not the previous one.

Change-Id: I8d13fecf3b978ae2e796dc6e10ef3f969b27a0f4
2010-07-15 22:22:57 -07:00
Dianne Hackborn
75a91389f1 Merge "Implement native key pre-dispatching to IMEs." into gingerbread 2010-07-15 22:22:42 -07:00
Dianne Hackborn
2c6081ce35 Implement native key pre-dispatching to IMEs.
This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code.  It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.

Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in.  Unfortunately IMEs don't
currently provide this information. :p

Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
2010-07-15 22:05:33 -07:00
Kenny Root
181bb0ab46 am 02c8730c: Add API to call to vold for mounting OBBs
Merge commit '02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp

* commit '02c8730c1bf19daf48bec8c6995df676a00a73b1':
  Add API to call to vold for mounting OBBs
2010-07-15 21:35:53 -07:00
Kenny Root
02c8730c1b Add API to call to vold for mounting OBBs
* Unhide StorageService class; hide all the USB-related items

* Add application-visible API to StorageManager for OBB files

* Add class for parceling OBB info across binders (ObbInfo)

* Add a JNI glue class to libutils/ObbFile (ObbScanner)

* Add API to MountService to deal with calling into vold and checking
  permissions

Change-Id: I33ecf9606b8ff535f3a2ada83931da6bbef41cfd
2010-07-15 21:31:58 -07:00
Jeff Brown
aca672ba2e am c5ed5910: Add support for new input sources.
Merge commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637' into gingerbread-plus-aosp

* commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637':
  Add support for new input sources.
2010-07-15 18:47:24 -07:00
Jeff Brown
c5ed5910c9 Add support for new input sources.
Added several new coordinate values to MotionEvents to capture
touch major/minor area, tool major/minor area and orientation.

Renamed NDK input constants per convention.

Added InputDevice class in Java which will eventually provide
useful information about available input devices.

Added APIs for manufacturing new MotionEvent objects with multiple
pointers and all necessary coordinate data.

Fixed a bug in the input dispatcher where it could get stuck with
a pointer down forever.

Fixed a bug in the WindowManager where the input window list could
end up containing stale removed windows.

Fixed a bug in the WindowManager where the input channel was being
removed only after the final animation transition had taken place
which caused spurious WINDOW DIED log messages to be printed.

Change-Id: Ie55084da319b20aad29b28a0499b8dd98bb5da68
2010-07-15 18:32:33 -07:00
Romain Guy
1726cf285f Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value." 2010-07-15 18:24:02 -07:00
Christopher Tate
2c43b6cee1 am d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp

* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
  Fix jni registration typo
2010-07-15 18:21:33 -07:00
Scott Main
7ccdfbee63 am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp

* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:19:27 -07:00
Christopher Tate
d9452ecd0c Merge "Fix jni registration typo" into gingerbread 2010-07-15 18:19:17 -07:00
Scott Main
4cb8293bb3 am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread

* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip
2010-07-15 18:17:16 -07:00
Scott Main
d59f1dea17 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 2010-07-15 18:14:16 -07:00
Scott Main
c9659424cf am b8f4a84a: am 80fa5c86: docs: dashboard update
Merge commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e' into gingerbread-plus-aosp

* commit 'b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e':
  docs: dashboard update
2010-07-15 18:14:07 -07:00
Scott Main
b8f4a84ab9 am 80fa5c86: docs: dashboard update
Merge commit '80fa5c866eaf323c39bef4159a351950f0ea527a' into gingerbread

* commit '80fa5c866eaf323c39bef4159a351950f0ea527a':
  docs: dashboard update
2010-07-15 18:10:39 -07:00
Scott Main
80fa5c866e docs: dashboard update
Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
2010-07-15 17:56:59 -07:00
Masanori Ogino
c7d9d2790f Fix the problem that color drawable cache key conflicts another drawable one.
The cache key of a color drawable resource may be the same as another
drawable resource's value.

Change-Id: Ia971bb242ceac5e8f9346094009a10f356399ab9
(Reduced duplicated codes and replace TAB to white spaces)

And try to fix compile error.
2010-07-16 09:37:34 +09:00
Katie McCormick
3f50035c3d am a6a134d4: am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit 'a6a134d42df5fde04f2cc379175c756aff333cb3' into gingerbread-plus-aosp

* commit 'a6a134d42df5fde04f2cc379175c756aff333cb3':
  Doc change: Update AVD create instructions.
2010-07-15 17:32:04 -07:00
Katie McCormick
a6a134d42d am 28da8e5e: Merge "Doc change: Update AVD create instructions." into froyo
Merge commit '28da8e5e4aefd919064e3c33a311edf1af5a958e' into gingerbread

* commit '28da8e5e4aefd919064e3c33a311edf1af5a958e':
  Doc change: Update AVD create instructions.
2010-07-15 17:28:57 -07:00
Katie McCormick
28da8e5e4a Merge "Doc change: Update AVD create instructions." into froyo 2010-07-15 17:25:10 -07:00
Christopher Tate
b87e22d300 Fix jni registration typo
Change-Id: I930fe00edec4e19f643a6de5b1bfd0d59e0846db
2010-07-15 17:17:54 -07:00
Katie McCormick
c46efe6696 Doc change: Update AVD create instructions.
Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
2010-07-15 16:20:41 -07:00
Brad Fitzpatrick
527e9c8f04 am 703e5d3c: StrictMode: avoid an allocation in common case
Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp

* commit '703e5d3c7fbeb8ca0978045db01d40318f838612':
  StrictMode: avoid an allocation in common case
2010-07-15 15:52:48 -07:00
Brad Fitzpatrick
f96c2719c3 am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp

* commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
  StrictMode: batch drop box writes for system apps
2010-07-15 15:47:05 -07:00
Brad Fitzpatrick
703e5d3c7f StrictMode: avoid an allocation in common case
Make the initialValue() of the ThreadLocal be null, so checking it doesn't
cause one to be created in the case of an RPC call not using StrictMode.

Change-Id: I3ea19ce444a1b3c39a6e53c5cb5d4faf4b07a6c8
2010-07-15 15:46:36 -07:00
Brad Fitzpatrick
3e5e21d4dc am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp

* commit '1772c34e5331a6456c8a93051192d19ff873c062':
  StrictMode: gather and return violating stacks in Binder replies
2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
cc52121c4f am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread
Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp

* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
2010-07-15 15:44:41 -07:00
Brad Fitzpatrick
0c36c96f2a Merge "StrictMode: batch drop box writes for system apps" into gingerbread 2010-07-15 15:43:03 -07:00
Brad Fitzpatrick
1772c34e53 Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 2010-07-15 15:42:41 -07:00
Brad Fitzpatrick
c4b204bdc4 Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread 2010-07-15 15:42:12 -07:00
Christopher Tate
078ccbdbb9 am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
2010-07-15 15:03:32 -07:00
Christopher Tate
2c40582a6c Merge "Add native C APIs for working with the Asset Manager" into gingerbread 2010-07-15 15:00:14 -07:00
James Dong
10f8baa46c am 42ef0c71: Initial check-in for software m4v_h263 encoder
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
  Initial check-in for software m4v_h263 encoder
2010-07-15 14:37:33 -07:00
Christopher Tate
6cce32b6ad Add native C APIs for working with the Asset Manager
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
2010-07-15 14:28:21 -07:00
James Dong
42ef0c715d Initial check-in for software m4v_h263 encoder
Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
2010-07-15 13:28:21 -07:00
Brad Fitzpatrick
ad13b9807b StrictMode: batch drop box writes for system apps
Change-Id: Iab49c15ecccefea1d36d86271e1ceb37d79e9449
2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
5b747191ff StrictMode: gather and return violating stacks in Binder replies
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.

Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
727de40c6b More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
2010-07-15 13:18:05 -07:00
Eric Laurent
76c40f74ce Several improvements in audio effects volume control.
- Fixed crash when deleting an effect chained before an effect having volume control
- Changed EFFECT_FLAG_VOLUME_CTRL to implicitely include EFFECT_FLAG_VOLUME_IND
(not need to set both in effect descriptor).
- Volume control changes from one effect to another if needed according to effect enable state
- EFFECT_CMD_SET_VOLUME is only sent when their is an actual change in volume

Change-Id: Ieebaf09157e2627366023569d95516646e03e26c
2010-07-15 12:50:15 -07:00