16013 Commits

Author SHA1 Message Date
Jessica Hummel
587f43d872 Merge "Change API for setProfileOwner to require userId" 2014-02-18 17:31:31 +00:00
Jeff Sharkey
e62c4a10cb am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
  Structure device not freed in error case
2014-02-18 17:26:17 +00:00
Jeff Sharkey
d3b21393bf am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit 'fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
  Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:22:23 +00:00
Jeff Sharkey
9a41b24c8f am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '392ee12fd57870e1e8f0777d03295b0435babd1f':
  Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:22:18 +00:00
Jeff Sharkey
37d894a42b am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
2014-02-18 17:19:38 +00:00
Jeff Sharkey
41185c844f am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:15:44 +00:00
Jeff Sharkey
96190f1c05 am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:15:39 +00:00
Jeff Sharkey
60097a9c5a Merge "Structure device not freed in error case" 2014-02-18 17:12:14 +00:00
Jeff Sharkey
02a64daefe Merge "Tethering: Skip link local addresses when enabling NAT" 2014-02-18 17:11:10 +00:00
Jeff Sharkey
234b0b037e Merge "Fix, MountService now only sends one onShutDownComplete" 2014-02-18 17:10:02 +00:00
Adam Connors
661ec4710b Change API for setProfileOwner to require userId
Previously the userId of the current process used but it
makes the provisioning process cleaner to be able to pass
it in explicitly.

Change-Id: I670c4cf3638f1340f6d0bf856c3e01045df8c29e
2014-02-17 10:18:59 +00:00
Ben Gruver
4f4161442d am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
  Check the return value of listFiles on the ifw directory
2014-02-14 23:08:10 +00:00
Ben Gruver
509a243c2c Merge "Check the return value of listFiles on the ifw directory" 2014-02-14 21:15:50 +00:00
Ben Gruver
26c6b783d2 Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist

Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
2014-02-14 13:07:11 -08:00
Paul Lawrence
a9f387bdf0 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:01 +00:00
Jeff Brown
88aaef7128 am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.
* commit 'ce0552f360d8c8f0bc45095293be369800ce9c93':
  Refactor dream manager to new pattern.
2014-02-14 09:50:37 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern.
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
2014-02-14 09:14:09 +00:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
2014-02-13 23:26:59 -08:00
David Christie
d63b4314b8 Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233" 2014-02-13 20:25:01 +00:00
Craig Mautner
6b1a93fcb9 am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.
2014-02-13 19:24:23 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
2014-02-13 19:18:04 +00:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00
Craig Mautner
3e5ce55fde am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '4dd839756ce032cb6db613f08b9a28e5cd20bbe9':
  Update DimLayer sizes on rotation.
2014-02-13 19:13:02 +00:00
Craig Mautner
991146f8ef Don't null class member before using it.
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.

Fixes bug 12823709.

Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
2014-02-13 11:12:42 -08:00
Craig Mautner
d14fa78dc8 am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '0af894d25133890e7765e6c582b3ac4829070de8':
  Update DimLayer sizes on rotation.
2014-02-13 19:05:18 +00:00
Craig Mautner
0af894d251 Merge "Update DimLayer sizes on rotation." into klp-modular-dev 2014-02-13 19:02:02 +00:00
Craig Mautner
b660b9d8cf Update DimLayer sizes on rotation.
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.

Fixes bug 12780687.

Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
2014-02-13 10:59:16 -08:00
Dianne Hackborn
d39ccd0ad9 Merge "Start tracking radio up time." 2014-02-13 17:56:12 +00:00
Dianne Hackborn
e13c4c0b66 Start tracking radio up time.
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
2014-02-13 17:55:40 +00:00
Andreas Huber
d430354c6b Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."" 2014-02-13 17:22:49 +00:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
2014-02-13 17:22:33 +00:00
Andreas Huber
04f0cab79d Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 2014-02-13 16:35:03 +00:00
Paul Lawrence
8e39736f91 Support default, pattern, pin and password encryption types
Java plumbing to expose methods to get/set encryption type in
IMountService, and hooking up of those methods to the Settings app
so the type is set correctly.

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/412649/

Bug: 8769627
Change-Id: I70c0ed72d11f5ab6f0958a7f9c101b6822b13baa
2014-02-13 15:46:24 +00:00
Narayan Kamath
0051514845 resolved conflicts for merge of 396b9e79 to master
Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
2014-02-13 11:48:48 +00:00
Wink Saville
27bf55c815 am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
2014-02-13 08:44:55 +00:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Craig Mautner
1c5010a566 am f24ee132: am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
* commit 'f24ee13254b544b7e73ea1b28facc1996b8185ab':
  Add debug for 12987986.
2014-02-13 03:34:56 +00:00
Michael Wright
639c8becc6 Extract automatic brightness strategy
Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.

Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
2014-02-12 16:44:37 -08:00
Michael Wright
41a5cdf986 New ambient light level filtering for automatic brightness
This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.

Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
2014-02-12 15:50:54 -08:00
Craig Mautner
d3df99c474 am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
* commit '4b79f8380c47b0da89348e1115ea70e7898997ca':
  Add debug for 12987986.
2014-02-12 23:48:15 +00:00
Craig Mautner
4b79f8380c Merge "Add debug for 12987986." into klp-modular-dev 2014-02-12 23:44:56 +00:00
Craig Mautner
1646832219 Add debug for 12987986.
For bug 12987986.

Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
2014-02-12 15:43:40 -08:00
Craig Mautner
4cfd54eaf0 am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '69481d54c2c6da6ec931bb7435bddf7be1aba0af':
  Don't add windows from exiting app tokens twice.
2014-02-12 23:01:52 +00:00
Andreas Huber
7825334929 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
2014-02-12 15:00:05 -08:00
Nick Kralevich
d5c8044e7e resolved conflicts for merge of 1cbea39f to master
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
2014-02-12 14:41:25 -08:00
Craig Mautner
8dfda07dd4 am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '731c30c17dac51e2279f8f789a647c61bd55028b':
  Don't add windows from exiting app tokens twice.
2014-02-12 21:01:47 +00:00
Craig Mautner
731c30c17d Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev 2014-02-12 20:56:36 +00:00
Craig Mautner
ac90c19cab Don't add windows from exiting app tokens twice.
If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.

Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
2014-02-12 12:37:17 -08:00
John Spurlock
ae5708db9d am c4aee98a: Improve error handling in listener services.
* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
  Improve error handling in listener services.
2014-02-12 19:36:25 +00:00
John Spurlock
c4aee98a62 Improve error handling in listener services.
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.

Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound.  Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.

Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes.  That is, silently fail (or return null) - and provide a
log warning.

Bug:12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
2014-02-12 14:31:36 -05:00