16095 Commits

Author SHA1 Message Date
Jeff Brown
3651cb7b4a am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit 'cd9cd758d6dc884220f86ff10812c9e33a978de5':
  Start the dream manager even if dreams are not supported.
2014-02-24 22:25:19 +00:00
Jeff Brown
c213b3a34c am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit 'f7f80d7b54b11d432bb6e72da526edf369128ea7':
  Start the dream manager even if dreams are not supported.
2014-02-24 22:18:32 +00:00
Jeff Brown
f7f80d7b54 Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 2014-02-24 22:16:00 +00:00
Jeff Brown
e0dd3ca81d Start the dream manager even if dreams are not supported.
The dreams manager also manages dozing.  It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).

Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.

Bug: 12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
2014-02-24 14:07:27 -08:00
Dianne Hackborn
aec25d9224 Merge "Improve how battery stats collects network stats." 2014-02-24 20:33:42 +00:00
Jake Hamby
786e71ab11 Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
2014-02-24 11:42:51 -08:00
Dianne Hackborn
d0c5b9abed Improve how battery stats collects network stats.
This optimizes the path for battery stats to collect
per-uid network usage.  It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
2014-02-24 11:35:20 -08:00
Chad Brubaker
9862a48574 Merge "Only allow System apps to make VPN exempt routes" 2014-02-24 18:09:56 +00:00
Chad Brubaker
4845037a48 Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
Sander Alewijnse
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
Craig Mautner
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
2014-02-22 07:51:02 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
2014-02-22 07:33:24 +00:00
Craig Mautner
ffda464851 Merge "Fixes for ActivityView on home activity" into klp-modular-dev 2014-02-22 05:11:22 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
Craig Mautner
5eb4adcbda resolved conflicts for merge of d2794f5e to master
Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
2014-02-21 17:52:15 -08:00
Craig Mautner
21c09e8a58 am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit 'f0f454522ae5024645a292596e644c6f7a06853c':
  Reset deferred task removal when app token added.
2014-02-22 00:53:43 +00:00
Craig Mautner
f0f454522a Merge "Reset deferred task removal when app token added." into klp-modular-dev 2014-02-22 00:50:55 +00:00
Greg Hackmann
4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-22 00:46:52 +00:00
Craig Mautner
42bf39edbd Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.

Also added improved debugging.

Fixes bug 12987986.

Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
2014-02-21 16:46:22 -08:00
Greg Hackmann
0cab896a98 resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
2014-02-21 16:35:52 -08:00
Adam Lesinski
4c90185a35 am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '542b55d9a4bee2f98f8a0a6948e0873c5faaddc7':
  Fix broken IME when decrypting storage
2014-02-22 00:20:57 +00:00
Chad Brubaker
c023453a2b Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
2014-02-21 15:30:02 -08:00
Guang Zhu
c8124a1e79 Merge "add new accessibility action for EditText to set text content" 2014-02-21 22:28:22 +00:00
Adam Lesinski
c866151926 am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
  Fix broken IME when decrypting storage
2014-02-21 22:17:26 +00:00
Adam Lesinski
83930aa09a Merge "Fix broken IME when decrypting storage" into klp-modular-dev 2014-02-21 22:13:44 +00:00
Adam Lesinski
8793dd873d Fix broken IME when decrypting storage
Bug:13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
2014-02-21 14:06:47 -08:00
JP Abgrall
d98fff4a02 Merge "ConnectivityService: add support to set TCP initial rwnd" 2014-02-21 20:55:13 +00:00
JP Abgrall
32d1ac4d45 ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
2014-02-21 12:05:20 -08:00
Greg Hackmann
c9244720da open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Setting the time-of-day clock is still useful on systems where the RTC
device is not yet brought up or otherwise unavailable.  This matches the
in-kernel behavior of the Android alarm driver.

Change-Id: I6d4fdadab12e241ada7419425efd55bd13873c55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-02-21 09:53:25 -08:00
Greg Hackmann
38bf514668 Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls.  Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.

By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.

Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).

Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-02-21 09:53:19 -08:00
Robin Lee
c53bd971ba Merge "Check DeviceOwner exists before using packageName" 2014-02-21 17:16:11 +00:00
Craig Mautner
ae39c6283b am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.
* commit 'c72f5c2de565ab3c46176155f3414cc154b5df39':
  Add copyright notice to files missing them.
2014-02-21 17:06:08 +00:00
Craig Mautner
ec5c3b9040 am c2c0a61c: Add copyright notice to files missing them.
* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
  Add copyright notice to files missing them.
2014-02-21 16:55:55 +00:00
Sander Alewijnse
f475ca33d9 Enables a profile owner or device owner to set and clear default intent handler activities.
Those intent handlers are persistent preferences. They will remain the default intent
handler even if the set of potential event handlers for the intent filter changes
and if the intent preferences are reset.

Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
2014-02-21 15:24:20 +00:00
Ashok Bhat
17ab38f8a8 AArch64: Make AssetAtlasService 64-bit compatible
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
2014-02-21 13:02:34 +00:00
Craig Mautner
c2c0a61cf5 Add copyright notice to files missing them.
Fixes bug 13121968.

Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
2014-02-20 20:25:41 -08:00
Craig Mautner
e1abfdf711 am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '6222a8ef853609ea9c0f725c2412a2d25968d9da':
  Set the new SurfaceControl opaque flag.
2014-02-21 04:20:58 +00:00
Craig Mautner
709efec60d am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '56dbf7b092826b1cef42357bda422baf18d2292c':
  Resize DimLayer explicitly on rotation.
2014-02-21 04:20:39 +00:00
Guang Zhu
4cd353c038 add new accessibility action for EditText to set text content
Bug: 12872344
Change-Id: I85a3805ab0c34b96a7d4228f2382c8ff664e36e8
2014-02-20 20:05:34 -08:00
Michael Wright
d429710f8e Merge "Unbreak manual brightness setting." 2014-02-21 02:09:49 +00:00
Jeff Brown
ac8bdfe4f0 Merge "resolved conflicts for merge of baaa080b to master" 2014-02-21 02:07:45 +00:00
Jeff Brown
10102e4c0e resolved conflicts for merge of baaa080b to master
Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
2014-02-20 18:05:03 -08:00
Michael Wright
5c977ea1b7 Unbreak manual brightness setting.
Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
2014-02-20 18:02:27 -08:00
Ben Gruver
0e3b52e5e8 Merge "Add ability to match intents based on the package name of the intent sender" 2014-02-21 01:18:59 +00:00
Amith Yamasani
1a405db22a Merge "Abort removing account if prohibited by policy" 2014-02-21 00:06:03 +00:00
Amith Yamasani
5934dbc9f1 Abort removing account if prohibited by policy
Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
2014-02-20 15:23:36 -08:00
Craig Mautner
1648f042f3 am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit 'fd8a8ccbb79b3d83bb328d64c544c59251eef151':
  Set the new SurfaceControl opaque flag.
2014-02-20 22:39:52 +00:00
Craig Mautner
3519530fae am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '267b37ceff64b6adaeef52e3a582f1186144f93e':
  Resize DimLayer explicitly on rotation.
2014-02-20 22:39:49 +00:00
Craig Mautner
fd8a8ccbb7 Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 2014-02-20 22:36:52 +00:00
Craig Mautner
267b37ceff Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 2014-02-20 22:34:38 +00:00