83156 Commits

Author SHA1 Message Date
Craig Mautner
259328c04c Eliminate special battery calls by WindowManager
Previous to this change the WindowManager was notifying the
BatteryDtatsService about windows that keep the screen on. WM used a
custom WakeLock tag to indicate to PowerManagerService that it had
already notified the BatteryStatsService.

This change eliminates WindowManager notifying the BatteryStatsService
and lets PowerManagerService do the job.

Fixes bug 7030326.

Change-Id: I666dc6ef8f094b8d3d109fea6876be058e057b4f
2012-08-22 11:01:35 -07:00
Jason Sams
f9678070a0 Merge "Fix bug in grain." into jb-mr1-dev 2012-08-21 17:09:56 -07:00
Jason Sams
a8309cb7ee Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev 2012-08-21 17:08:17 -07:00
Brian Muramatsu
43c7aae4d0 Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev 2012-08-21 17:08:17 -07:00
John Grossman
df44184816 Merge "common_time: Move default election config to bcast." into jb-mr1-dev 2012-08-21 16:54:36 -07:00
John Grossman
7a947c4978 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
2012-08-21 16:39:11 -07:00
Brian Muramatsu
b94b41f516 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
2012-08-21 16:30:57 -07:00
Nick Pelly
4a81ef8fd3 Merge "Fix some location issues exposed by CTS." into jb-mr1-dev 2012-08-21 16:29:54 -07:00
Nick Pelly
1332b53522 Fix some location issues exposed by CTS.
Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059
2012-08-21 16:26:26 -07:00
Selim Gurun
a6d16993eb Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:12:56 -07:00
Jonathan Dixon
951fcabef6 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
2012-08-21 16:08:22 -07:00
Selim Gurun
b62999c136 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:06:04 -07:00
Stephen Hines
cdb05977ac Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev 2012-08-21 16:01:30 -07:00
Jason Sams
f1c051b6f2 Fix bug in grain.
Compare with 0 was done against unsigned which did not
correctly clamp.

Change-Id: I6dbff36190c279961017e57db3aaba51c60a0ad3
2012-08-21 15:54:07 -07:00
Jason Sams
19e1086df1 Move the kernel launch to specific intrinsic class.
This allows support of both input types. Kernel source
and global source.

Change-Id: Iea60bebd79c786795eae81c14cbec352b470a9c0
2012-08-21 15:53:29 -07:00
Mikhail Naganov
9d5e7aa38d 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
2012-08-21 15:52:40 -07:00
Dianne Hackborn
b4f56b5ea2 am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
2012-08-21 15:42:42 -07:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
2012-08-21 15:39:42 -07:00
Craig Mautner
7e877fa00c Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev 2012-08-21 15:30:42 -07:00
Craig Mautner
a2d7b1117a 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
2012-08-21 15:24:54 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Craig Mautner
de1d96c736 Merge "Hide non user app windows from other users." into jb-mr1-dev 2012-08-21 14:26:28 -07:00
Amith Yamasani
23e282554e Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev 2012-08-21 14:19:51 -07:00
Teng-Hui Zhu
2253eeab6c Add context support into the filter framework.
Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
2012-08-21 14:17:02 -07:00
Jean-Baptiste Queru
02df84a3b1 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()
2012-08-21 14:02:02 -07:00
Jean-Baptiste Queru
34d8574665 am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()
2012-08-21 14:00:11 -07:00
Nick Pelly
257662efe2 Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev 2012-08-21 13:53:04 -07:00
Nick Pelly
5584b497b7 Print timestamp (instead of age) in Location#toString()
Age was a bad idea, since it depends when toString() was called

Change-Id: Ica0b6bfa9a93b5a452ba3def5fbb2b0a0194c401
2012-08-21 13:52:20 -07:00
Scott Anderson
ccc7b98eaf Merge "BatteryService: Fix comment to match code" into jb-mr1-dev 2012-08-21 13:34:48 -07:00
Jim Miller
f644976101 Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 2012-08-21 13:19:31 -07:00
Scott Anderson
5ad9fc2182 BatteryService: Fix comment to match code
Change-Id: Ib4e30e7808ff3a2a8a49c000eac719a3a4273fdd
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-21 13:11:26 -07:00
Jean-Baptiste Queru
b8da225f26 Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 2012-08-21 13:09:19 -07:00
Chet Haase
66bcbb9e39 Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev 2012-08-21 13:03:49 -07:00
Baligh Uddin
df5c3a54c7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 12:19:53 -07:00
Irfan Sheriff
5e8e41e41a Merge "Fix NPE" into jb-mr1-dev 2012-08-21 11:47:19 -07:00
Irfan Sheriff
06d371f87b Fix NPE
Bug: 7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
2012-08-21 11:44:01 -07:00
Maxim Siniavine
88cb79e7a1 Merge "Added a test to measure memory usage of apps." into jb-mr1-dev 2012-08-21 11:43:07 -07:00
Maxim Siniavine
9229700728 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
2012-08-21 11:31:44 -07:00
Baligh Uddin
848bde2688 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-21 11:19:47 -07:00
Dianne Hackborn
d4ec5ae504 Merge "Improve multi-user app management." into jb-mr1-dev 2012-08-21 11:17:12 -07:00
Baligh Uddin
11780f2f66 Import translations. DO NOT MERGE
Change-Id: Ie9c95838e61ce5fffd21db7cd63f393a7ec2735e
Auto-generated-cl: translation import
2012-08-21 10:43:48 -07:00
Dianne Hackborn
0c38049502 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
2012-08-21 10:34:20 -07:00
Baligh Uddin
11cc42e968 Import translations. DO NOT MERGE
Change-Id: I3b4b81ee8d14c074583f9ca030da42a28bba25c4
Auto-generated-cl: translation import
2012-08-21 10:22:53 -07:00
Amith Yamasani
a10d1aa6c7 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
2012-08-21 09:51:13 -07:00
Guang Zhu
7b3ca5bb41 Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev 2012-08-20 21:10:39 -07:00
Guang Zhu
738d39c5a0 Revert "fix sdcard path for webkit perf and layout test scripts"
This reverts commit 8aaa32b13e565893c57059ca14eb49fbe4bdf0ba

Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a
2012-08-20 21:09:28 -07:00
Jeff Brown
8eaba60026 Merge "Disable electron beam on animation." into jb-mr1-dev 2012-08-20 20:28:50 -07:00
Jeff Brown
256237c99f Merge "Plumb the switch code into Dalvik." into jb-mr1-dev 2012-08-20 20:26:11 -07:00
Jeff Brown
892f371c6b Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 2012-08-20 20:25:14 -07:00
Jeff Brown
5356c7dc72 Disable electron beam on animation.
We want the screen to come back on as soon as possible.

Change-Id: Ifdaa2e88d19590c3da53be985dd886633e5cac59
2012-08-20 20:19:16 -07:00