OSDN Git Service
Jeff Brown [Wed, 22 Aug 2012 07:11:15 +0000 (00:11 -0700)]
am
8f1584af: am
2416e096: Extract the twilight detection into its own service.
* commit '
8f1584aff3b442263008f5b972721214691c64f1':
Extract the twilight detection into its own service.
Jeff Brown [Wed, 22 Aug 2012 07:09:12 +0000 (00:09 -0700)]
am
2416e096: Extract the twilight detection into its own service.
* commit '
2416e09649eb6ab767eba458796e126196c77a34':
Extract 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
Jeff Brown [Wed, 22 Aug 2012 06:45:09 +0000 (23:45 -0700)]
am
fbb0ac66: am
ae25108a: Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
* commit '
fbb0ac66b6f1948b11b74033e1c783ecc78f7d56':
Add support for auto-brightness adjust, but leave it disabled.
Jeff Brown [Wed, 22 Aug 2012 06:43:25 +0000 (23:43 -0700)]
am
ae25108a: Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev
* commit '
ae25108a7b7181bedac11d6b31ff0a64ece729aa':
Add support for auto-brightness adjust, but leave it disabled.
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
Jeff Brown [Wed, 22 Aug 2012 06:23:06 +0000 (23:23 -0700)]
am
7e68e923: am
11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev
* commit '
7e68e923058295b5b0b789f00cf66d0a289e2115':
Make the screen brightness setting limits configurable.
Jeff Brown [Wed, 22 Aug 2012 06:21:14 +0000 (23:21 -0700)]
am
11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev
* commit '
11167b887aa2af52b861f5ffd31efa0882c80ec5':
Make the screen brightness setting limits configurable.
Jeff Brown [Wed, 22 Aug 2012 06:20:22 +0000 (23:20 -0700)]
am
64ce3396: am
572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev
* commit '
64ce3396dba49e95a0fbf912890c91d3339b7b87':
Add FloatMath.pow.
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
Jeff Brown [Wed, 22 Aug 2012 06:18:33 +0000 (23:18 -0700)]
am
572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev
* commit '
572a0859dd258d2d72588bfd22b750a4322d3b23':
Add FloatMath.pow.
Jeff Brown [Wed, 22 Aug 2012 06:15:55 +0000 (23:15 -0700)]
Merge "Add FloatMath.pow." into jb-mr1-dev
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
Jeff Brown [Wed, 22 Aug 2012 05:04:02 +0000 (22:04 -0700)]
Make the screen brightness setting limits configurable.
Change-Id: Ica84951c482edef6b7faebe1af22c609a1b9e8be
Jeff Brown [Wed, 22 Aug 2012 02:49:48 +0000 (19:49 -0700)]
Add FloatMath.pow.
Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
Jason Sams [Wed, 22 Aug 2012 00:16:30 +0000 (17:16 -0700)]
am
d9cde043: am
f9678070: Merge "Fix bug in grain." into jb-mr1-dev
* commit '
d9cde0435d2469ada77aa45465ade4cd92aa88fe':
Fix bug in grain.
Jason Sams [Wed, 22 Aug 2012 00:14:48 +0000 (17:14 -0700)]
am
6afc755b: am
a8309cb7: Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
* commit '
6afc755bf09b63727be1ffd36753e45b5c16b96a':
Move the kernel launch to specific intrinsic class.
Brian Muramatsu [Wed, 22 Aug 2012 00:14:45 +0000 (17:14 -0700)]
am
07d9f60b: am
43c7aae4: Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
* commit '
07d9f60b15e0d7e3678ed0a6429394b975eec2dc':
Listen for CONNECTIVITY_ACTION in GPS Provider
Jason Sams [Wed, 22 Aug 2012 00:13:06 +0000 (17:13 -0700)]
am
f9678070: Merge "Fix bug in grain." into jb-mr1-dev
* commit '
f9678070a03ad16d223d26a38b319d38d5943a71':
Fix bug in grain.
Jason Sams [Wed, 22 Aug 2012 00:11:24 +0000 (17:11 -0700)]
am
a8309cb7: Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
* commit '
a8309cb7ee05502176c2715f381ea5e63016daae':
Move the kernel launch to specific intrinsic class.
Brian Muramatsu [Wed, 22 Aug 2012 00:11:20 +0000 (17:11 -0700)]
am
43c7aae4: Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev
* commit '
43c7aae4d0cf9e2d3527b093022ae1fa70d3920f':
Listen for CONNECTIVITY_ACTION in GPS Provider
Jason Sams [Wed, 22 Aug 2012 00:09:56 +0000 (17:09 -0700)]
Merge "Fix bug in grain." 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
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
John Grossman [Tue, 21 Aug 2012 23:59:37 +0000 (16:59 -0700)]
am
b6a9ebc9: am
df441848: Merge "common_time: Move default election config to bcast." into jb-mr1-dev
* commit '
b6a9ebc9c7508694ad477992c0d9c8763a90569e':
common_time: Move default election config to bcast.
John Grossman [Tue, 21 Aug 2012 23:57:21 +0000 (16:57 -0700)]
am
df441848: Merge "common_time: Move default election config to bcast." into jb-mr1-dev
* commit '
df441848164a4cded48595abf64f379c31e026f5':
common_time: Move default election config to bcast.
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
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
Nick Pelly [Tue, 21 Aug 2012 23:34:21 +0000 (16:34 -0700)]
am
8c37dc72: am
4a81ef8f: Merge "Fix some location issues exposed by CTS." into jb-mr1-dev
* commit '
8c37dc72c41c6ed54c1e6aa56a7adca9cce3568d':
Fix some location issues exposed by CTS.
Nick Pelly [Tue, 21 Aug 2012 23:32:31 +0000 (16:32 -0700)]
am
4a81ef8f: Merge "Fix some location issues exposed by CTS." into jb-mr1-dev
* commit '
4a81ef8fd3207b06a65709338470d1e6ebed8620':
Fix some location issues exposed by CTS.
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
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
Nick Pelly [Tue, 21 Aug 2012 23:25:47 +0000 (16:25 -0700)]
Fix some location issues exposed by CTS.
Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059
Selim Gurun [Tue, 21 Aug 2012 23:18:43 +0000 (16:18 -0700)]
am
e62bf6b7: (-s ours) am
a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
* commit '
e62bf6b7e407801d523f235c8d878619a752f7b1':
Small tidy up to getDefaultUserAgent. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:15:23 +0000 (16:15 -0700)]
am
a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev
* commit '
a6d16993eb6b8834095b8e308523b2d28259e430':
Small tidy up to getDefaultUserAgent. DO NOT MERGE
Selim Gurun [Tue, 21 Aug 2012 23:13:31 +0000 (16:13 -0700)]
am
0cf5fdb5: (-s ours) am
b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
* commit '
0cf5fdb57dc9dab6c62c7560c00b1b6200e23947':
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
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
Selim Gurun [Tue, 21 Aug 2012 23:08:34 +0000 (16:08 -0700)]
am
b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev
* commit '
b62999c136802f5ab0b95308b3751702d72afcb8':
Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. 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
Stephen Hines [Tue, 21 Aug 2012 23:07:11 +0000 (16:07 -0700)]
am
c744c14a: am
cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
* commit '
c744c14ae770b01195da843e614ad1046f6f652a':
Switch to v8 (and appropriate llvm-rs-cc stuff).
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
Stephen Hines [Tue, 21 Aug 2012 23:04:37 +0000 (16:04 -0700)]
am
cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
* commit '
cdb05977acede73c1362e8365a196839078fc896':
Switch to v8 (and appropriate llvm-rs-cc stuff).
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
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
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
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
Dianne Hackborn [Tue, 21 Aug 2012 22:47:57 +0000 (15:47 -0700)]
am
37674ee7: am
b4f56b5e: am
8b97ee6d: am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
37674ee787533cc992951e8f41bd67717995a9c1':
ActivityThread: Avoid creating duplicate handlers and reuse mH
Dianne Hackborn [Tue, 21 Aug 2012 22:45:32 +0000 (15:45 -0700)]
am
b4f56b5e: am
8b97ee6d: am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
b4f56b5ea23325a492b61989a94a738be0fe9b8b':
ActivityThread: Avoid creating duplicate handlers and reuse mH
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
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
Craig Mautner [Tue, 21 Aug 2012 22:36:09 +0000 (15:36 -0700)]
am
66c61175: am
7e877fa0: Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev
* commit '
66c6117538e11ca5a91fc26a17b353348c6f6ddf':
Fix to allow SYSTEM_UID to display windows.
Craig Mautner [Tue, 21 Aug 2012 22:33:41 +0000 (15:33 -0700)]
am
7e877fa0: Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev
* commit '
7e877fa00c6b093a0fe734e5d3bf23b5b2d6411e':
Fix to allow SYSTEM_UID to display windows.
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
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
Dianne Hackborn [Tue, 21 Aug 2012 22:12:45 +0000 (15:12 -0700)]
Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
Craig Mautner [Tue, 21 Aug 2012 21:31:03 +0000 (14:31 -0700)]
am
b9bccdbb: am
de1d96c7: Merge "Hide non user app windows from other users." into jb-mr1-dev
* commit '
b9bccdbbbc6bb189cc7f17c7b9118b1d81dfc63d':
Hide non user app windows from other users.
Craig Mautner [Tue, 21 Aug 2012 21:29:07 +0000 (14:29 -0700)]
am
de1d96c7: Merge "Hide non user app windows from other users." into jb-mr1-dev
* commit '
de1d96c736730c2a99a225311b9211a34042f9d4':
Hide non user app windows from other users.
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
Amith Yamasani [Tue, 21 Aug 2012 21:24:12 +0000 (14:24 -0700)]
am
d20c1016: am
23e28255: Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev
* commit '
d20c1016109bb045ad5b38879c762a14a2502f81':
Multiprocess activity should be allowed to run on current user
Teng-Hui Zhu [Tue, 21 Aug 2012 21:22:33 +0000 (14:22 -0700)]
am
861f91d6: am
2253eeab: Add context support into the filter framework.
* commit '
861f91d6f0c00c97243b685e7ff3158cb33d61b3':
Add context support into the filter framework.
Amith Yamasani [Tue, 21 Aug 2012 21:22:14 +0000 (14:22 -0700)]
am
23e28255: Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev
* commit '
23e282554ee0ddff80fd5bd2f47d5fb37b3b02c5':
Multiprocess activity should be allowed to run on current user
Teng-Hui Zhu [Tue, 21 Aug 2012 21:20:35 +0000 (14:20 -0700)]
am
2253eeab: Add context support into the filter framework.
* commit '
2253eeab6c0c20e0b03f144c5bc23ae13e8ab234':
Add context support into the filter framework.
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
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
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:06:38 +0000 (14:06 -0700)]
am
8fe96f47: am
02df84a3: am
34d85746: am
b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '
8fe96f4766b2ebc6215416b43988ae36ea58e63a':
Tests/RS: Add RS context check for RsBalls setAccel()
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:03:34 +0000 (14:03 -0700)]
am
02df84a3: am
34d85746: am
b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '
02df84a3b1b4f68044d981bb345515ae9419d0c1':
Tests/RS: Add RS context check for RsBalls setAccel()
Nick Pelly [Tue, 21 Aug 2012 21:02:24 +0000 (14:02 -0700)]
am
4002b8a1: am
257662ef: Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev
* commit '
4002b8a177b590e0f2180945a78040e475e385be':
Print timestamp (instead of age) in Location#toString()
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()
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()
Nick Pelly [Tue, 21 Aug 2012 20:55:23 +0000 (13:55 -0700)]
am
257662ef: Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev
* commit '
257662efe2a5edd13601b4372b5c1ff0431ddda9':
Print timestamp (instead of age) in Location#toString()
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
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
Jonathan Dixon [Tue, 21 Aug 2012 20:49:08 +0000 (13:49 -0700)]
Merge "Small tidy up to getDefaultUserAgent"
Scott Anderson [Tue, 21 Aug 2012 20:39:29 +0000 (13:39 -0700)]
am
a457531b: am
ccc7b98e: Merge "BatteryService: Fix comment to match code" into jb-mr1-dev
* commit '
a457531b12df47f92becb8d4b59f5526657999ff':
BatteryService: Fix comment to match code
Scott Anderson [Tue, 21 Aug 2012 20:37:11 +0000 (13:37 -0700)]
am
ccc7b98e: Merge "BatteryService: Fix comment to match code" into jb-mr1-dev
* commit '
ccc7b98eaf6b7067d3585661e690121fa1430feb':
BatteryService: Fix comment to match code
Scott Anderson [Tue, 21 Aug 2012 20:34:47 +0000 (13:34 -0700)]
Merge "BatteryService: Fix comment to match code" into jb-mr1-dev
Jim Miller [Tue, 21 Aug 2012 20:24:30 +0000 (13:24 -0700)]
am
652520ae: am
f6449761: Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev
* commit '
652520aed571c87993dcf7d4f98ecc39804212ee':
Update AppWidgetHost with better support for OnClickHandlers
Jim Miller [Tue, 21 Aug 2012 20:22:02 +0000 (13:22 -0700)]
am
f6449761: Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev
* commit '
f644976101e45a7801b58cea1d86f5e1744046ec':
Update AppWidgetHost with better support for OnClickHandlers
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
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>
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:09:18 +0000 (13:09 -0700)]
Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
Chet Haase [Tue, 21 Aug 2012 20:08:03 +0000 (13:08 -0700)]
am
a5fc3b10: am
66bcbb9e: Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev
* commit '
a5fc3b1011522bfe9345726d0bba8cf903fb88c6':
Fix notification panel bug which prevented proper resizing
Chet Haase [Tue, 21 Aug 2012 20:06:27 +0000 (13:06 -0700)]
am
66bcbb9e: Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev
* commit '
66bcbb9e39f6c877210e7aa46b8e5d38fd79070a':
Fix notification panel bug which prevented proper resizing
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
Baligh Uddin [Tue, 21 Aug 2012 19:24:47 +0000 (12:24 -0700)]
am
9fbb733f: (-s ours) am
df5c3a54: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
9fbb733fc02b9cce65e8d98df2e3db155e511b77':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 19:23:01 +0000 (12:23 -0700)]
am
df5c3a54: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
df5c3a54c7e955fb89951b63ff49f275a53f9c35':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 19:19:53 +0000 (12:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 19:17:46 +0000 (12:17 -0700)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Tue, 21 Aug 2012 18:52:00 +0000 (11:52 -0700)]
am
d721b87c: am
5e8e41e4: Merge "Fix NPE" into jb-mr1-dev
* commit '
d721b87cfd6424963b0ce4613e57b51d68cf27d1':
Fix NPE
Irfan Sheriff [Tue, 21 Aug 2012 18:50:02 +0000 (11:50 -0700)]
am
5e8e41e4: Merge "Fix NPE" into jb-mr1-dev
* commit '
5e8e41e41aecd2a4951659a1f3507f3371e0cc47':
Fix NPE
Irfan Sheriff [Tue, 21 Aug 2012 18:47:18 +0000 (11:47 -0700)]
Merge "Fix NPE" into jb-mr1-dev
Maxim Siniavine [Tue, 21 Aug 2012 18:46:16 +0000 (11:46 -0700)]
am
dc2dbfab: am
88cb79e7: Merge "Added a test to measure memory usage of apps." into jb-mr1-dev
* commit '
dc2dbfabc3d4681da64a50f21253da2945a0c32b':
Added a test to measure memory usage of apps.
Maxim Siniavine [Tue, 21 Aug 2012 18:45:20 +0000 (11:45 -0700)]
am
88cb79e7: Merge "Added a test to measure memory usage of apps." into jb-mr1-dev
* commit '
88cb79e7a168b653c9678809da67f55607ec4006':
Added a test to measure memory usage of apps.
Irfan Sheriff [Tue, 21 Aug 2012 18:44:01 +0000 (11:44 -0700)]
Fix NPE
Bug:
7026244
Change-Id: I21f13bdbd2d33f0cc082f85474229d9909eb47c1
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
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
Baligh Uddin [Tue, 21 Aug 2012 18:24:35 +0000 (11:24 -0700)]
am
44234f83: (-s ours) am
848bde26: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
44234f83f3a447ec13bf59d8399d4ac8235f1d37':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 21 Aug 2012 18:22:39 +0000 (11:22 -0700)]
am
848bde26: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
848bde2688e9b44dffd0d8b7c7428602b7db451e':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 21 Aug 2012 18:21:24 +0000 (11:21 -0700)]
am
b73b0a2c: am
d4ec5ae5: Merge "Improve multi-user app management." into jb-mr1-dev
* commit '
b73b0a2c7f188073ca021a74907a0f02e10092aa':
Improve multi-user app management.
Baligh Uddin [Tue, 21 Aug 2012 18:19:47 +0000 (11:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
OSDN Git Service
