OSDN Git Service

android-x86/frameworks-base.git
11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 22 Aug 2012 13:33:45 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMake the electron beam animation shorter.
Jeff Brown [Wed, 22 Aug 2012 06:11:46 +0000 (23:11 -0700)]
Make the electron beam animation shorter.

Now using about the same duration as it used to have when
it was implemented in Surface Flinger.

Change-Id: I09b28222379f4b6583f1f7b34188cc36c50509e9

11 years agoAdd a mechanism to adjust auto-brightness at night.
Jeff Brown [Wed, 22 Aug 2012 05:14:26 +0000 (22:14 -0700)]
Add a mechanism to adjust auto-brightness at night.

Uses the twilight service to determine the hours of
sunrise and sunset.  Shortly after sunset or before sunrise
gradually start to apply a gamma correction factor to the
auto-brightness calculations to make the screen a little
dimmer at night.

The effect is relatively small and is mostly noticeable
in dark rooms.  This is just a first pass at the algorithm,
we can tweak the adjustment later to ensure that it has even less
impact in moderate or bright environments.

Change-Id: Idf89022a5d0bb52975e04779352d53fa63371178

11 years agoExtract the twilight detection into its own service.
Jeff Brown [Wed, 22 Aug 2012 05:12:20 +0000 (22:12 -0700)]
Extract the twilight detection into its own service.

Moving the detection out of UiModeManagerService will
make it easy for other services to register for the
information.

Fixed a bugs related to updating twilight state
when the time is updated.

We're using the same algorithm as before for passively
tracking the location.  Ideally we should update it
to use the new location manager features for low-power
location requests.

Change-Id: I520c53b9946ab6f8d994587d357fd6542c300c07

11 years agoMerge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 06:40:19 +0000 (23:40 -0700)]
Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev

11 years agoMerge "Make the screen brightness setting limits configurable." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 06:19:08 +0000 (23:19 -0700)]
Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev

11 years agoMerge "Add FloatMath.pow." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 06:15:55 +0000 (23:15 -0700)]
Merge "Add FloatMath.pow." into jb-mr1-dev

11 years agoAdd support for auto-brightness adjust, but leave it disabled.
Jeff Brown [Wed, 22 Aug 2012 05:10:57 +0000 (22:10 -0700)]
Add support for auto-brightness adjust, but leave it disabled.

Auto-brightness adjustment applies a gamma correction factor
between 1/3 and 3 depending on the setting.  This feature
is disabled for now.

Change-Id: I2b300b5c455da545bea56b2bae5bc7903e30f30e

11 years agoMake the screen brightness setting limits configurable.
Jeff Brown [Wed, 22 Aug 2012 05:04:02 +0000 (22:04 -0700)]
Make the screen brightness setting limits configurable.

Change-Id: Ica84951c482edef6b7faebe1af22c609a1b9e8be

11 years agoAdd FloatMath.pow.
Jeff Brown [Wed, 22 Aug 2012 02:49:48 +0000 (19:49 -0700)]
Add FloatMath.pow.

Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c

11 years agoMerge "Fix bug in grain." into jb-mr1-dev
Jason Sams [Wed, 22 Aug 2012 00:09:56 +0000 (17:09 -0700)]
Merge "Fix bug in grain." into jb-mr1-dev

11 years agoMerge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
Jason Sams [Wed, 22 Aug 2012 00:08:16 +0000 (17:08 -0700)]
Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev

11 years agoMerge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
Brian Muramatsu [Tue, 21 Aug 2012 23:54:51 +0000 (16:54 -0700)]
Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev

11 years agoMerge "common_time: Move default election config to bcast." into jb-mr1-dev
John Grossman [Tue, 21 Aug 2012 23:54:36 +0000 (16:54 -0700)]
Merge "common_time: Move default election config to bcast." into jb-mr1-dev

11 years agocommon_time: Move default election config to bcast.
John Grossman [Tue, 21 Aug 2012 23:39:11 +0000 (16:39 -0700)]
common_time: Move default election config to bcast.

Change the default master election and arbiration to use broadcast
instead of multicast.  As nice as the idea of using multicast for
discovery is, in the end it had just proven to be too unreliable in
random people's home infrastructures as well as the more complicated
managed infrastructures we are using internally.  Multicast still
works, and the service can still be configured to use it, but for now
we are switching to broadcast.

Also, add runtime checks to filter out our own broadcast traffic as
there does not seem to be any good sockopt in linux to do this for us
(there is one for multicast, but not broadcast).

Change-Id: I8ada3541cceca2e76c7a0c1a624a72026122c312

11 years agoListen for CONNECTIVITY_ACTION in GPS Provider
Brian Muramatsu [Tue, 21 Aug 2012 23:30:57 +0000 (16:30 -0700)]
Listen for CONNECTIVITY_ACTION in GPS Provider

Bug: 7020678

The broadcast receiver in GpsLocationProvider now listens for
CONNECTIVITY_ACTION changes. Set the intent filter so that
it catches those actions and updates the network state.

Change-Id: I7efd393dfe2aa8b172dd6701d42ff9ed687648a2

11 years agoMerge "Fix some location issues exposed by CTS." into jb-mr1-dev
Nick Pelly [Tue, 21 Aug 2012 23:29:54 +0000 (16:29 -0700)]
Merge "Fix some location issues exposed by CTS." into jb-mr1-dev

11 years agoFix some location issues exposed by CTS.
Nick Pelly [Tue, 21 Aug 2012 23:25:47 +0000 (16:25 -0700)]
Fix some location issues exposed by CTS.

Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059

11 years agoMerge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
Selim Gurun [Tue, 21 Aug 2012 23:12:55 +0000 (16:12 -0700)]
Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev

11 years agoSmall tidy up to getDefaultUserAgent. DO NOT MERGE
Jonathan Dixon [Mon, 20 Aug 2012 23:37:15 +0000 (16:37 -0700)]
Small tidy up to getDefaultUserAgent. DO NOT MERGE

- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4c2be71d529d35572c5f807beee7ddc

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007

11 years agoMerge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE...
Selim Gurun [Tue, 21 Aug 2012 23:06:04 +0000 (16:06 -0700)]
Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
Stephen Hines [Tue, 21 Aug 2012 23:01:30 +0000 (16:01 -0700)]
Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev

11 years agoFix bug in grain.
Jason Sams [Tue, 21 Aug 2012 22:54:07 +0000 (15:54 -0700)]
Fix bug in grain.

Compare with 0 was done against unsigned which did not
correctly clamp.

Change-Id: I6dbff36190c279961017e57db3aaba51c60a0ad3

11 years agoMove the kernel launch to specific intrinsic class.
Jason Sams [Tue, 21 Aug 2012 22:53:29 +0000 (15:53 -0700)]
Move the kernel launch to specific intrinsic class.

This allows support of both input types. Kernel source
and global source.

Change-Id: Iea60bebd79c786795eae81c14cbec352b470a9c0

11 years agoImplement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
Mikhail Naganov [Tue, 7 Aug 2012 17:26:52 +0000 (18:26 +0100)]
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE

TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Clean cherry pick: 1202d66f78fb24850b997e37f0ce3cb3b36e4bbf

Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe

11 years agoam 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers...
Dianne Hackborn [Tue, 21 Aug 2012 22:42:42 +0000 (15:42 -0700)]
am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"

* commit '8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
  ActivityThread: Avoid creating duplicate handlers and reuse mH

11 years agoam b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
Dianne Hackborn [Tue, 21 Aug 2012 22:39:42 +0000 (15:39 -0700)]
am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"

* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH

11 years agoMerge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev
Craig Mautner [Tue, 21 Aug 2012 22:30:41 +0000 (15:30 -0700)]
Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev

11 years agoFix to allow SYSTEM_UID to display windows.
Craig Mautner [Tue, 21 Aug 2012 22:12:20 +0000 (15:12 -0700)]
Fix to allow SYSTEM_UID to display windows.

Was not previously checking to make sure that the appId was not
SYSTEM_UID (1000). This caused certain system windows to fail to
appear.

Change-Id: I939dc2f8a256acb84b7c413c7e00003a89aff6d4

11 years agoMerge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
Dianne Hackborn [Tue, 21 Aug 2012 22:12:45 +0000 (15:12 -0700)]
Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"

11 years agoMerge "Hide non user app windows from other users." into jb-mr1-dev
Craig Mautner [Tue, 21 Aug 2012 21:26:28 +0000 (14:26 -0700)]
Merge "Hide non user app windows from other users." into jb-mr1-dev

11 years agoMerge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev
Amith Yamasani [Tue, 21 Aug 2012 21:19:51 +0000 (14:19 -0700)]
Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev

11 years agoAdd context support into the filter framework.
Teng-Hui Zhu [Tue, 7 Aug 2012 00:24:10 +0000 (17:24 -0700)]
Add context support into the filter framework.

Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2

11 years agoam 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:02:02 +0000 (14:02 -0700)]
am 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"

* commit '34d8574665caaef52f7c595b57f45f1c9efd7e39':
  Tests/RS: Add RS context check for RsBalls setAccel()

11 years agoam b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:00:11 +0000 (14:00 -0700)]
am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"

* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()

11 years agoMerge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev
Nick Pelly [Tue, 21 Aug 2012 20:53:04 +0000 (13:53 -0700)]
Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev

11 years agoPrint timestamp (instead of age) in Location#toString()
Nick Pelly [Mon, 20 Aug 2012 21:40:24 +0000 (14:40 -0700)]
Print timestamp (instead of age) in Location#toString()

Age was a bad idea, since it depends when toString() was called

Change-Id: Ica0b6bfa9a93b5a452ba3def5fbb2b0a0194c401

11 years agoMerge "BatteryService: Fix comment to match code" into jb-mr1-dev
Scott Anderson [Tue, 21 Aug 2012 20:34:47 +0000 (13:34 -0700)]
Merge "BatteryService: Fix comment to match code" into jb-mr1-dev

11 years agoMerge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev
Jim Miller [Tue, 21 Aug 2012 20:19:31 +0000 (13:19 -0700)]
Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev

11 years agoBatteryService: Fix comment to match code
Scott Anderson [Tue, 21 Aug 2012 20:01:58 +0000 (13:01 -0700)]
BatteryService: Fix comment to match code

Change-Id: Ib4e30e7808ff3a2a8a49c000eac719a3a4273fdd
Signed-off-by: Scott Anderson <saa@android.com>
11 years agoMerge "Tests/RS: Add RS context check for RsBalls setAccel()"
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:09:18 +0000 (13:09 -0700)]
Merge "Tests/RS: Add RS context check for RsBalls setAccel()"

11 years agoMerge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev
Chet Haase [Tue, 21 Aug 2012 20:03:49 +0000 (13:03 -0700)]
Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 19:19:53 +0000 (12:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Fix NPE" into jb-mr1-dev
Irfan Sheriff [Tue, 21 Aug 2012 18:47:18 +0000 (11:47 -0700)]
Merge "Fix NPE" into jb-mr1-dev

11 years agoFix NPE
Irfan Sheriff [Tue, 21 Aug 2012 18:44:01 +0000 (11:44 -0700)]
Fix NPE

Bug: 7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1

11 years agoMerge "Added a test to measure memory usage of apps." into jb-mr1-dev
Maxim Siniavine [Tue, 21 Aug 2012 18:43:07 +0000 (11:43 -0700)]
Merge "Added a test to measure memory usage of apps." into jb-mr1-dev

11 years agoAdded a test to measure memory usage of apps.
Maxim Siniavine [Fri, 17 Aug 2012 21:17:06 +0000 (14:17 -0700)]
Added a test to measure memory usage of apps.

Each app uses a certain amount of memory when running in the
foreground. This test takes a list of app on the command line
starts them one at a time and reports the total PSS of the
app's process. The test allows to monitor memory usage over time.

Change-Id: I3411bd96cf7c7af10acbb8deeb9936469b810ea2

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 18:19:47 +0000 (11:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Improve multi-user app management." into jb-mr1-dev
Dianne Hackborn [Tue, 21 Aug 2012 18:17:11 +0000 (11:17 -0700)]
Merge "Improve multi-user app management." into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 17:43:48 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie9c95838e61ce5fffd21db7cd63f393a7ec2735e
Auto-generated-cl: translation import

11 years agoImprove multi-user app management.
Dianne Hackborn [Tue, 21 Aug 2012 00:23:30 +0000 (17:23 -0700)]
Improve multi-user app management.

Introduce API to get per-user storage information, keep track
of services associated with users, and various small cleanup.

Change-Id: I5d4e784e7ff3cccfed627d66a090d2f464202634

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 17:22:53 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3b4b81ee8d14c074583f9ca030da42a28bba25c4
Auto-generated-cl: translation import

11 years agoMultiprocess activity should be allowed to run on current user
Amith Yamasani [Tue, 21 Aug 2012 16:49:53 +0000 (09:49 -0700)]
Multiprocess activity should be allowed to run on current user

Multiprocess flag should override singleton checks.

This allows ChooserActivity to run in the process/user that launched it.
Wallpaper chooser from Launcher now works for secondary users.

Change-Id: I17a99278ed2a6d2491c3016a549134a85bc2af00

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 21 Aug 2012 13:34:21 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb...
Guang Zhu [Tue, 21 Aug 2012 04:10:39 +0000 (21:10 -0700)]
Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev

11 years agoRevert "fix sdcard path for webkit perf and layout test scripts"
Guang Zhu [Tue, 21 Aug 2012 04:09:28 +0000 (21:09 -0700)]
Revert "fix sdcard path for webkit perf and layout test scripts"

This reverts commit 8aaa32b13e565893c57059ca14eb49fbe4bdf0ba

Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a

11 years agoMerge "Disable electron beam on animation." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:28:50 +0000 (20:28 -0700)]
Merge "Disable electron beam on animation." into jb-mr1-dev

11 years agoMerge "Plumb the switch code into Dalvik." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:25:52 +0000 (20:25 -0700)]
Merge "Plumb the switch code into Dalvik." into jb-mr1-dev

11 years agoMerge "Encapsulate locks in UEventObservers." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 03:25:14 +0000 (20:25 -0700)]
Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev

11 years agoDisable electron beam on animation.
Jeff Brown [Tue, 21 Aug 2012 03:17:36 +0000 (20:17 -0700)]
Disable electron beam on animation.

We want the screen to come back on as soon as possible.

Change-Id: Ifdaa2e88d19590c3da53be985dd886633e5cac59

11 years agoPlumb the switch code into Dalvik.
Jeff Brown [Tue, 21 Aug 2012 03:16:01 +0000 (20:16 -0700)]
Plumb the switch code into Dalvik.

Bug: 6548391
Change-Id: If0e918669ba27ca0e6561930d4abc427c34de42d

11 years agoEncapsulate locks in UEventObservers.
Jeff Brown [Tue, 21 Aug 2012 03:15:34 +0000 (20:15 -0700)]
Encapsulate locks in UEventObservers.

Synchronized methods make me cry so fixing this first before
I introduce any new functionality that could result in a deadlock.

Bug: 6548391
Change-Id: I9c006dc491ce205bfd86acf828dcebda2a63b2ca

11 years agoMerge "Add factory test feature to shut off on long press power." into jb-mr1-dev
Jeff Brown [Tue, 21 Aug 2012 02:41:48 +0000 (19:41 -0700)]
Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev

11 years agoFix notification panel bug which prevented proper resizing
Chet Haase [Tue, 21 Aug 2012 00:34:33 +0000 (17:34 -0700)]
Fix notification panel bug which prevented proper resizing

When the notification panel is opened larger than the list's length,
the penl is put into a "rubber band" mode, to animate the bottom of the
panel back to the end of the list. But the rubber band mode is never
unset, which causes an improper result if another notification is ended,
preventing the panel from resizing to the new, appropriate size of the list.

Fix is to unset the rubber banding flag when the snapping animation finishes.

Issue #6992133 Notification bar does not drop down completely in Mako

Change-Id: Id93918086353f58d6eb6bb071556f08eb2e2706e

11 years agoMerge "Support scrolling layers with the mousewheel" into jb-mr1-dev
John Reck [Tue, 21 Aug 2012 00:33:19 +0000 (17:33 -0700)]
Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev

11 years agoSupport scrolling layers with the mousewheel
John Reck [Tue, 21 Aug 2012 00:13:47 +0000 (17:13 -0700)]
Support scrolling layers with the mousewheel

 Bug: 6635437
 Fix onGenericAction to support scrolling layers.
 Calling startScrollingLayer detects if there is a layer under
 the mouse pointer, and if so switches to DRAG_LAYER_MODE. Then, calling
 doDrag will correctly handle scrolling the layer in DRAG_LAYER_MODE,
 switching out of DRAG_LAYER_MODE when we hit the end of a layer, and
 scrolling the page if there isn't a layer. It is the method used
 by the touch drag path.

Change-Id: I00be09a63c40caa8fce94134c57db0894a62fef0

11 years agoMerge "add wireless charger support" into jb-mr1-dev
Brian Muramatsu [Mon, 20 Aug 2012 23:57:13 +0000 (16:57 -0700)]
Merge "add wireless charger support" into jb-mr1-dev

11 years agoHide non user app windows from other users.
Craig Mautner [Mon, 6 Aug 2012 21:15:42 +0000 (14:15 -0700)]
Hide non user app windows from other users.

When transitioning between old user and new user application windows
from the old user may not be shown because only one user's windows
can be shown at a time.

Change-Id: I4e17b36c9100c9457cc6eb3cb3b77f3a94fa2b41

11 years agoUpdate AppWidgetHost with better support for OnClickHandlers
Jim Miller [Fri, 10 Aug 2012 02:22:32 +0000 (19:22 -0700)]
Update AppWidgetHost with better support for OnClickHandlers

This updates AppWidgetHost and AppWidgetHostView to do a better
job at refreshing widgets and their host views.  It now allows
an OnClickHandler to be specified when creating the AppWidgetHost
which allows it to correctly update AppWidgetHostViews when needed.

Change-Id: I710c1d00a8d145bf3a9fd5f5691885bec9d1c7e4

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 20 Aug 2012 22:43:10 +0000 (15:43 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:26:53 +0000 (15:26 -0700)]
am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"

* commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854':
  To avoid the JNI memory leaks in video editor codes

11 years agoMerge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 22:23:16 +0000 (15:23 -0700)]
Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev

11 years agoMerge "Adjust auto-brightness time constants." into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 22:09:41 +0000 (15:09 -0700)]
Merge "Adjust auto-brightness time constants." into jb-mr1-dev

11 years agoMerge "Fix some proximity sensor bugs." into jb-mr1-dev
Jeff Brown [Mon, 20 Aug 2012 21:59:18 +0000 (14:59 -0700)]
Merge "Fix some proximity sensor bugs." into jb-mr1-dev

11 years agoresolved conflicts for merge of 4ea6a8eb to jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:57:23 +0000 (14:57 -0700)]
resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev

Change-Id: I51b1732011f31ea07087ef0898b47de8977074de

11 years agoMerge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev
Iliyan Malchev [Mon, 20 Aug 2012 21:57:14 +0000 (14:57 -0700)]
Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev

11 years agoAdd factory test feature to shut off on long press power.
Jeff Brown [Mon, 20 Aug 2012 21:56:57 +0000 (14:56 -0700)]
Add factory test feature to shut off on long press power.

Bug: 6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862

11 years agoam 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:45 +0000 (14:50 -0700)]
am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"

* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes

11 years agoam f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:40 +0000 (14:50 -0700)]
am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"

* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error

11 years agoMerge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev
Benoit Goby [Mon, 20 Aug 2012 21:48:11 +0000 (14:48 -0700)]
Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev

11 years agoMerge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:29:51 +0000 (14:29 -0700)]
Merge "To avoid the JNI memory leaks in video editor codes"

11 years agoMerge "Switch widget: Fix ON/OFF option update error"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:28:32 +0000 (14:28 -0700)]
Merge "Switch widget: Fix ON/OFF option update error"

11 years agoMerge "Pass URLs to package verifiers" into jb-mr1-dev
rich cannings [Mon, 20 Aug 2012 21:24:49 +0000 (14:24 -0700)]
Merge "Pass URLs to package verifiers" into jb-mr1-dev

11 years agoMerge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 21:20:31 +0000 (14:20 -0700)]
Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev

11 years agoAdjust auto-brightness time constants.
Jeff Brown [Mon, 20 Aug 2012 21:02:12 +0000 (14:02 -0700)]
Adjust auto-brightness time constants.

Specifically, dim a little more slowly.

Change-Id: I10d66a83ddc3a63f8c93d740a0cb116e6c974d10

11 years agoAdd UsbDebuggingManager and UsbDebuggingActivity
Benoit Goby [Thu, 26 Apr 2012 01:06:00 +0000 (18:06 -0700)]
Add UsbDebuggingManager and UsbDebuggingActivity

The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.

Change-Id: I115c828331d8e326c380844ee33915d5dff22260

11 years agoMerge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
George Mount [Mon, 20 Aug 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev

11 years agoFix some proximity sensor bugs.
Jeff Brown [Mon, 20 Aug 2012 20:24:23 +0000 (13:24 -0700)]
Fix some proximity sensor bugs.

Forgot to clear waiting for proximity negative flag.
Waiting for proximity negative also shouldn't turn the screen off
if it is currently on.

Change-Id: I9885b2f54b185beb961acda44176bc5f11a9f58b

11 years agoPass URLs to package verifiers
rich cannings [Mon, 20 Aug 2012 20:20:14 +0000 (13:20 -0700)]
Pass URLs to package verifiers

This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000

11 years agoDO NOT MERGE LocaleSpan makes Han disambiguation easy!
Victoria Lease [Fri, 17 Aug 2012 22:34:01 +0000 (15:34 -0700)]
DO NOT MERGE LocaleSpan makes Han disambiguation easy!

Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.

I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I5692859bfd2aafc284172454d943afc250b22535

11 years agoMerge "DO NOT MERGE Han Preference" into jb-mr1-dev
Victoria Lease [Mon, 20 Aug 2012 20:11:43 +0000 (13:11 -0700)]
Merge "DO NOT MERGE Han Preference" into jb-mr1-dev

11 years agoam 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"
Kenny Root [Mon, 20 Aug 2012 19:57:36 +0000 (12:57 -0700)]
am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"

* commit '7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
  Use Libcore.os.umask for setting umask

11 years agoam f029c22f: Merge "Use Libcore.os.umask for setting umask"
Kenny Root [Mon, 20 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am f029c22f: Merge "Use Libcore.os.umask for setting umask"

* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask

11 years agoRevert "Revert "Add timestamp in scan results""
Iliyan Malchev [Mon, 20 Aug 2012 19:52:35 +0000 (12:52 -0700)]
Revert "Revert "Add timestamp in scan results""

With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 578531082b8e8c8aa03868e69591b7613b0e8b8e

Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0

11 years agoMerge "Update TCP buffer size when switching network type" into jb-mr1-dev
Robert Greenwalt [Mon, 20 Aug 2012 19:52:24 +0000 (12:52 -0700)]
Merge "Update TCP buffer size when switching network type" into jb-mr1-dev

11 years agoMerge "Add getmtime to Android KeyStore API" into jb-mr1-dev
Kenny Root [Mon, 20 Aug 2012 19:45:16 +0000 (12:45 -0700)]
Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev

11 years agoAdd AndroidKeyStore provider for KeyStore API
Kenny Root [Fri, 10 Aug 2012 15:28:37 +0000 (08:28 -0700)]
Add AndroidKeyStore provider for KeyStore API

This introduces a public API for the Android keystore that is accessible
via java.security.KeyStore API. This allows programs to store
PrivateKeyEntry and TrustedCertificateEntry items visible only to
themselves.

Future work should include:

* Implement KeyStore.CallbackHandlerProtection parameter to allow the
  caller to request that the keystore daemon unlock itself via the
  system password input dialog.

* Implement SecretKeyEntry once that support is in keystore daemon

Change-Id: I382ffdf742d3f9f7647c5f5a429244a340b6bb0a

11 years agoMerge "Use Libcore.os.umask for setting umask"
Kenny Root [Mon, 20 Aug 2012 19:32:14 +0000 (12:32 -0700)]
Merge "Use Libcore.os.umask for setting umask"

11 years agoUpdate TCP buffer size when switching network type
Robert Greenwalt [Mon, 20 Aug 2012 18:15:39 +0000 (11:15 -0700)]
Update TCP buffer size when switching network type

Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2

11 years agoUse Libcore.os.umask for setting umask
Kenny Root [Fri, 17 Aug 2012 15:45:55 +0000 (08:45 -0700)]
Use Libcore.os.umask for setting umask

Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34