OSDN Git Service
Glenn Kasten [Fri, 15 Jul 2011 23:24:26 +0000 (16:24 -0700)]
Merge "CPU statistics library"
Rajneesh Chowdury [Fri, 15 Jul 2011 23:08:01 +0000 (16:08 -0700)]
Merge "Fix for issue
5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF"
John Reck [Fri, 15 Jul 2011 22:58:43 +0000 (15:58 -0700)]
Merge "Implement SeekBarPreference.onGetDefaultValue"
John Reck [Fri, 15 Jul 2011 22:48:01 +0000 (15:48 -0700)]
Implement SeekBarPreference.onGetDefaultValue
Bug:
5036325
Change-Id: I1db0ed3809b862a547e5fda40027852f8b46aa38
Chet Haase [Fri, 15 Jul 2011 22:29:30 +0000 (15:29 -0700)]
Merge "Fix leak in LayoutTransition"
Chet Haase [Fri, 15 Jul 2011 22:24:18 +0000 (15:24 -0700)]
Fix leak in LayoutTransition
Static objects were referencing the first LayoutTransition object,
which referenced its target container, which eventually referenced the
Activity. That reference chain never went away.
The fix is to create animators that do not reference any target
object (they are just templates which are loaded with real target
objects when they are started).
Change-Id: Ie29f53bf3b886b8052b6ee3a56647a312d9adeaa
Chia-chi Yeh [Fri, 15 Jul 2011 22:22:56 +0000 (15:22 -0700)]
Merge "VpnDialogs: change paddings."
Chia-chi Yeh [Fri, 15 Jul 2011 22:21:44 +0000 (15:21 -0700)]
VpnDialogs: change paddings.
Change-Id: I46d949099778d1801ac1ca81b845b93936ceecb9
Rajneesh Chowdury [Fri, 15 Jul 2011 18:27:50 +0000 (11:27 -0700)]
Fix for issue
5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF
Change-Id: I1c7c32fee491871223ad12df4696363415902377
Christopher Tate [Fri, 15 Jul 2011 22:05:53 +0000 (15:05 -0700)]
Merge "Support for compressed backups"
Christopher Tate [Thu, 14 Jul 2011 02:30:21 +0000 (19:30 -0700)]
Support for compressed backups
The backup format now includes a stream header. That header begins with
a magic string and version number, then includes a flag stating whether
the archive data is compressed, and then in the case of encrypted archives
states the password salt used during encryption key stretching.
When compression is used, everything following the header is run through
a standard zlib "deflate" compressor before being sent downstream.
Change-Id: Ica72753e4ef2c3d13e63b45e7722a00652940a55
Irfan Sheriff [Fri, 15 Jul 2011 21:38:04 +0000 (14:38 -0700)]
Merge "WifiWatchdog rewrite to formal statemachine"
Chet Haase [Fri, 15 Jul 2011 21:32:21 +0000 (14:32 -0700)]
Merge "Read font info from system config files"
Mathias Agopian [Fri, 15 Jul 2011 21:32:10 +0000 (14:32 -0700)]
Merge "dump GLES strings in SF dumpsys log"
Mathias Agopian [Fri, 15 Jul 2011 01:01:49 +0000 (18:01 -0700)]
dump GLES strings in SF dumpsys log
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
Gloria Wang [Fri, 15 Jul 2011 21:20:45 +0000 (14:20 -0700)]
Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
Andreas Huber [Fri, 15 Jul 2011 21:16:15 +0000 (14:16 -0700)]
Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
Glenn Kasten [Fri, 8 Jul 2011 21:36:46 +0000 (14:36 -0700)]
CPU statistics library
Change-Id: I113e2a926466cc410cfa5602ceb165b390a290fc
John Reck [Fri, 15 Jul 2011 20:18:50 +0000 (13:18 -0700)]
Merge "Add a hidden generic property interface"
Jamie Gennis [Fri, 15 Jul 2011 19:35:34 +0000 (12:35 -0700)]
Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"
Isaac Levy [Thu, 14 Jul 2011 00:41:45 +0000 (17:41 -0700)]
WifiWatchdog rewrite to formal statemachine
Rewrote wifiwatchdog service to use net.statemachine
Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
Chia-chi Yeh [Fri, 15 Jul 2011 19:00:55 +0000 (12:00 -0700)]
VpnDialogs: enforce calling permissions.
Change-Id: I1bb3bd4616309f091ef653ee246b97b1a006a225
Gloria Wang [Fri, 15 Jul 2011 18:53:17 +0000 (11:53 -0700)]
Use unsigned char to store table of contents retrieved from XING header.
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.
Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
Chet Haase [Wed, 6 Jul 2011 18:17:26 +0000 (11:17 -0700)]
Read font info from system config files
This change adds new files in /system/etc: system_fonts.xml and
fallback_fonts.xml. The change also allows a third file to be added
by vendors in /vendor/etc/fallback_fonts.xml. These files, loaded at
boot time, mimic the logic that used to be in code, but which is
now configurable through editing these files, making the system more
flexible and easy to work with for us and vendors as future fonts
are added to the system.
Change-Id: I209f1ef08a5279b376b89a880241906387efd576
Andreas Huber [Fri, 15 Jul 2011 18:30:16 +0000 (11:30 -0700)]
Refetch playlists according to the HLS specs, varying delay if playlists unchanged
since the previous fetch.
Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug:
4983546
Romain Guy [Thu, 14 Jul 2011 01:46:21 +0000 (18:46 -0700)]
Add new ViewDebug APIs to profile the event queue.
Change-Id: I225bf288780b0244f459316e2765cfa29cd22c89
Nick Pelly [Fri, 15 Jul 2011 18:20:44 +0000 (11:20 -0700)]
am
fc00b2ed: am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
fc00b2ed4fa64621015b47310b91e937581bd3a3':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
John Reck [Fri, 15 Jul 2011 18:14:43 +0000 (11:14 -0700)]
Add a hidden generic property interface
Change-Id: Iff890d7802af00a80b0148c7cc3233c6fc4d5dad
Justin Ho [Fri, 15 Jul 2011 18:13:22 +0000 (11:13 -0700)]
Merge "Updated some effects and notifications"
Robert Greenwalt [Fri, 15 Jul 2011 18:03:52 +0000 (11:03 -0700)]
Gilles Debunne [Fri, 15 Jul 2011 18:03:42 +0000 (11:03 -0700)]
Merge "Removed vertical padding in PreferenceActivity header list on phones"
Robert Greenwalt [Fri, 15 Jul 2011 18:01:36 +0000 (11:01 -0700)]
Merge "resolved conflicts for merge of
8550f3b8 to master"
Alex Sakhartchouk [Fri, 15 Jul 2011 17:57:33 +0000 (10:57 -0700)]
Merge "For the serialization context, no fifo initialization is necessary."
Gilles Debunne [Fri, 15 Jul 2011 17:55:32 +0000 (10:55 -0700)]
Merge "Bug
4382356: No automatic focus change in ScrollViews"
Robert Greenwalt [Fri, 15 Jul 2011 17:52:54 +0000 (10:52 -0700)]
resolved conflicts for merge of
8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
Nick Pelly [Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)]
am
1bce9e25: am
01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '
1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Robert Greenwalt [Fri, 15 Jul 2011 17:20:48 +0000 (10:20 -0700)]
Fred Quintana [Fri, 15 Jul 2011 17:10:07 +0000 (10:10 -0700)]
Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them."
Gilles Debunne [Fri, 15 Jul 2011 16:56:30 +0000 (09:56 -0700)]
Bug
4382356: No automatic focus change in ScrollViews
The current behavior in ScrollView is inconsistent: a slow scroll will
not change focus while a fling will. With this change, the focus is not
moved from field to field (resulting in poup due to keyboard / suggestion bar
state changes).
Also made sure any new input in a TextFields scrolls back the view to make the
EditText visible. Has no effect if the EditText is already visible.
Change-Id: I7ff301fe85f73c27d76e4893aeab7442d0539b13
Robert Greenwalt [Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)]
resolved conflicts for merge of
0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
Fabrice Di Meglio [Fri, 15 Jul 2011 16:49:48 +0000 (09:49 -0700)]
Merge "Implement textDirection heuristic selection."
Robert Greenwalt [Fri, 15 Jul 2011 16:45:08 +0000 (09:45 -0700)]
Small fix to
5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.
bug:
5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
Gilles Debunne [Fri, 15 Jul 2011 16:41:16 +0000 (09:41 -0700)]
Merge "Bug
5014726: Paste works in ExtractedText"
Glenn Kasten [Fri, 15 Jul 2011 16:23:33 +0000 (09:23 -0700)]
Merge "Bug
5031179 possible fix for assert in join"
Mike Lockwood [Fri, 15 Jul 2011 16:18:34 +0000 (09:18 -0700)]
Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"
Mike Lockwood [Fri, 15 Jul 2011 13:45:11 +0000 (09:45 -0400)]
MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files
Bug:
5025615
Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57
Signed-off-by: Mike Lockwood <lockwood@android.com>
Justin Ho [Fri, 15 Jul 2011 15:48:03 +0000 (08:48 -0700)]
Updated some effects and notifications
Change-Id: I9151a1ee6bf520199a17ec0d184f9d9af838b281
Narayan Kamath [Fri, 15 Jul 2011 09:56:31 +0000 (02:56 -0700)]
Merge "Remove the completeAudioAvailable API."
Jeff Brown [Fri, 15 Jul 2011 05:42:15 +0000 (22:42 -0700)]
Merge "Ensure selector state is updated when touch mode changes."
Jeff Brown [Fri, 15 Jul 2011 05:32:09 +0000 (22:32 -0700)]
Merge "Remove edge slop support."
Jeff Brown [Fri, 15 Jul 2011 05:31:40 +0000 (22:31 -0700)]
Merge "Refresh the drawable state when selecting a position."
Jeff Brown [Fri, 15 Jul 2011 05:31:34 +0000 (22:31 -0700)]
Merge "ListView focus bugfix."
Jeff Brown [Fri, 15 Jul 2011 05:31:27 +0000 (22:31 -0700)]
Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."
Jeff Brown [Fri, 15 Jul 2011 05:31:17 +0000 (22:31 -0700)]
Merge "Frameworks: fixes possible invalid pointer index call."
Jeff Brown [Fri, 15 Jul 2011 05:19:19 +0000 (22:19 -0700)]
Ensure selector state is updated when touch mode changes.
This fixes a problem where the focus selection rectangle
often remains visible even after entering touch mode.
This problem is particularly noticeable when using the
mouse to scroll the list while an item is selected.
Change-Id: I9938d2586725d91fd3f6738408233f2ead167319
Jeff Brown [Fri, 15 Jul 2011 04:55:58 +0000 (21:55 -0700)]
Merge "Enter touch mode on ACTION_SCROLL."
Adam Powell [Fri, 15 Jul 2011 04:53:41 +0000 (21:53 -0700)]
Merge "Fix bug
5032301 - size list menu icons appropriately."
Adam Powell [Fri, 15 Jul 2011 04:52:18 +0000 (21:52 -0700)]
Fix bug
5032301 - size list menu icons appropriately.
Change-Id: I309923cdd4d37292b390a9b760dec739becb1bbf
Jeff Brown [Fri, 15 Jul 2011 04:48:23 +0000 (21:48 -0700)]
Remove edge slop support.
The edge slop feature was added a long time ago for a specific
device that had severe non-linear touch response issues near
the edges of its touch screen. The feature is not useful on
modern hardware that is property calibrated.
Change-Id: I26716cbc7411c31883ddb4bb4ddd981027790d0f
Jason Bayer [Wed, 23 Mar 2011 03:03:31 +0000 (20:03 -0700)]
Refresh the drawable state when selecting a position.
It seems that mSelectorShowing is a dead (always false) field.
Bug:
4070346
Change-Id: Icf3cc6f19cc49dcfda15229a6d91232404c0743c
Jeff Sharkey [Fri, 15 Jul 2011 04:15:49 +0000 (21:15 -0700)]
Merge "Hide NetworkTemplate details, buffered stats I/O."
Adam Powell [Fri, 15 Jul 2011 04:08:10 +0000 (21:08 -0700)]
Fix bug
5030341 - ActionBar.getHeight is inaccurate in 2-row mode
Measure the shared container instead.
Change-Id: Ib851f773a36add19c227b3ad64a8497f1b5ff9dd
Jeff Sharkey [Fri, 15 Jul 2011 03:37:37 +0000 (20:37 -0700)]
Hide NetworkTemplate details, buffered stats I/O.
Move template matching to builder methods instead of exposing the
internal constants. Also rule to match Ethernet usage. Buffer
reading and writing of network stats, making operations 5x faster.
Change-Id: Iedb2d0ab3b26a976811c050f84a164e909eb74b6
Mark Lindner [Thu, 30 Jun 2011 23:26:51 +0000 (16:26 -0700)]
ListView focus bugfix.
resurrectSelection() didn't take into account disabled items
(which shouldn't ever get focus).
Bug:
4967915
Change-Id: I849d2d993ddf93f49108e7b867ff6d24643c07a8
Mathias Agopian [Fri, 15 Jul 2011 03:21:59 +0000 (20:21 -0700)]
Merge "fix a typo in ISurfaceTexture IPC code"
Mathias Agopian [Fri, 15 Jul 2011 03:20:58 +0000 (20:20 -0700)]
fix a typo in ISurfaceTexture IPC code
Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
Le-Chun Wu [Thu, 14 Jul 2011 21:27:18 +0000 (14:27 -0700)]
Add a call to pthread_attr_destroy to avoid potential memory leaks.
Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
Justin Koh [Fri, 1 Jul 2011 00:11:26 +0000 (17:11 -0700)]
Frameworks: fixes possible invalid pointer index call.
Fixes possible invalid pointer index call in AbsListView.
Bug:
4982383
Change-Id: I9b88ab6a055c7678ef81fbe3187473edf8d12f6a
Jeff Brown [Fri, 15 Jul 2011 02:14:22 +0000 (19:14 -0700)]
Enter touch mode on ACTION_SCROLL.
Also fix the lastTouch tracking so it ignores irrelevant non-touch
events (like ACTION_HOVER).
Change-Id: I9e04872cb1f762aa6dcded1f9f83bf20eda17415
Chia-chi Yeh [Fri, 15 Jul 2011 02:05:33 +0000 (19:05 -0700)]
Merge "VPN: tear down VPN when the dependent interface is down."
Chia-chi Yeh [Fri, 15 Jul 2011 01:55:33 +0000 (18:55 -0700)]
VPN: tear down VPN when the dependent interface is down.
Change-Id: I1eaf8e39ee7aed1f4ecbd4c36c2a81a68ad2f9d1
Adam Powell [Fri, 15 Jul 2011 01:58:28 +0000 (18:58 -0700)]
Merge "Smooth the spinners"
Adam Powell [Thu, 14 Jul 2011 19:14:41 +0000 (12:14 -0700)]
Smooth the spinners
Change-Id: I36de60dc05e5c15692d33d030973f27d54a9d465
Adam Powell [Fri, 15 Jul 2011 01:52:26 +0000 (18:52 -0700)]
Merge "Fix regression with legacy expanded menus"
Adam Powell [Fri, 15 Jul 2011 01:50:02 +0000 (18:50 -0700)]
Fix regression with legacy expanded menus
Change-Id: I28a21dc72d11c6729370e0acd90b06ed98baf098
Robert Greenwalt [Thu, 14 Jul 2011 21:28:05 +0000 (14:28 -0700)]
Apply the dns and route diff which we get a change
bug:
5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
Mathias Agopian [Fri, 15 Jul 2011 01:04:09 +0000 (18:04 -0700)]
Merge "sensorservice: be more robust when there are no sensor h/w"
Jamie Gennis [Fri, 15 Jul 2011 00:54:27 +0000 (17:54 -0700)]
Merge changes Id9aa1003,I8c154189
* changes:
SurfaceTexture: make (dis)connect into an IPC
SurfaceTexture: add support for new connect values
Jamie Gennis [Thu, 14 Jul 2011 02:12:20 +0000 (19:12 -0700)]
SurfaceTexture: make (dis)connect into an IPC
This change makes the ANativeWindow connect and disconnect calls result
in an IPC to the SurfaceTexture object. This will allow us to prevent
multiple simultaneous connections from different processes.
Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
Dianne Hackborn [Fri, 15 Jul 2011 00:23:28 +0000 (17:23 -0700)]
Merge "Move LoadAverageService to the SystemUI apk."
Jamie Gennis [Fri, 15 Jul 2011 00:11:47 +0000 (17:11 -0700)]
SurfaceTexture: fix SurfaceTextureGLToGLTest
This change fixes a couple different issues in the
SurfaceTextureGLToGLTest test fixture:
- incorrect use of conditions
- move logging after the locks are acquired
- call the parent class's TearDown method
- clean up the SurfaceTexture before eglTerminate gets called
Change-Id: I6960e5ab7f144225f01a2089d3f849c99fed0b38
Jeff Brown [Fri, 15 Jul 2011 00:08:16 +0000 (17:08 -0700)]
Merge "Minor code cleanups in vector."
Jeff Brown [Thu, 14 Jul 2011 23:52:10 +0000 (16:52 -0700)]
Merge "Replace Vector _grow/_shrink checks with assert."
James Dong [Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)]
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
Mathias Agopian [Thu, 14 Jul 2011 23:39:46 +0000 (16:39 -0700)]
sensorservice: be more robust when there are no sensor h/w
Bug:
5030108
Change-Id: I45b85b3c492b9268cb0ae44d2e5fc8c708b6e66e
James Dong [Thu, 14 Jul 2011 23:22:47 +0000 (16:22 -0700)]
Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."
This reverts commit
a5293d1ca4459293f4993ea39c09ea703a022844.
Conflicts:
media/libstagefright/AwesomePlayer.cpp
Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
Chia-chi Yeh [Thu, 14 Jul 2011 23:22:21 +0000 (16:22 -0700)]
Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors."
Chia-chi Yeh [Thu, 14 Jul 2011 23:19:19 +0000 (16:19 -0700)]
VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
Glenn Kasten [Thu, 14 Jul 2011 23:16:54 +0000 (16:16 -0700)]
Bug
5031179 possible fix for assert in join
Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
Dianne Hackborn [Thu, 14 Jul 2011 23:10:16 +0000 (16:10 -0700)]
Move LoadAverageService to the SystemUI apk.
Change-Id: I442e264802d1e35cd7d27bae121ae75f932595b6
Adam Cohen [Thu, 14 Jul 2011 22:55:55 +0000 (15:55 -0700)]
Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter"
Adam Cohen [Thu, 14 Jul 2011 21:45:07 +0000 (14:45 -0700)]
Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter
Change-Id: I8a481e106b27d145fda92aa0d747e4a8615a5fd0
Jim Miller [Thu, 14 Jul 2011 22:43:17 +0000 (15:43 -0700)]
Merge "Fix
5027468: prevent screen from turning back on while lockscreen in password mode."
Fabrice Di Meglio [Thu, 14 Jul 2011 22:31:03 +0000 (15:31 -0700)]
Merge "Fix bug #
5025936 TableLayout layout direction resolution is broken"
Chia-chi Yeh [Thu, 14 Jul 2011 22:22:59 +0000 (15:22 -0700)]
Merge "VPN: Hook up the new control protocol and network state."
Chia-chi Yeh [Thu, 14 Jul 2011 22:05:05 +0000 (15:05 -0700)]
VPN: Hook up the new control protocol and network state.
1. No more End-Of-Arguments.
2. Daemons close the control socket after they are initialized.
3. No more system properties.
4. ip-up-vpn now creates state to pass the configuration.
5. JNI methods are split again for legacy VPN.
Change-Id: I02fafdf01d425c965345ef712b2bd5fdee3a0cab
Jim Miller [Thu, 14 Jul 2011 22:04:42 +0000 (15:04 -0700)]
Fix
5027468: prevent screen from turning back on while lockscreen in password mode.
This fixes a bug where LockScreen would turn back on due to the sequence of events
that ultimately cause PasswordUnlockScreen.onResume() to be called when the device powers off.
This is required because the lockscreen rebuilds itself before the screen turns off
so that it's ready to show immediately when the device comes back on.
Change-Id: I86a61cc3b1d77cf7f2a9a198051ea2bbe90607b2
Jamie Gennis [Wed, 13 Jul 2011 19:57:23 +0000 (12:57 -0700)]
SurfaceTexture: add support for new connect values
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.
Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
Justin Ho [Thu, 14 Jul 2011 21:54:01 +0000 (14:54 -0700)]
Merge "Initial pass at some preload drawables Bug:
5020126"
Chia-chi Yeh [Thu, 14 Jul 2011 21:53:58 +0000 (14:53 -0700)]
Merge "ip-up-vpn: Create proper states for pppd and racoon."