797 Commits

Author SHA1 Message Date
John Spurlock
aa2112f671 Merge "Zen mode tweaks." 2014-04-30 01:53:09 +00:00
John Spurlock
e86de4c067 Zen mode tweaks.
- Fix regression with alarms.
 - Run all condition provider callbacks on the main thread.
 - Exit zen mode if the current condition is disabled / uninstalled.

Bug:14402762
Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
2014-04-29 21:48:26 -04:00
Michael Wright
15c32f2699 Merge "Move key attribute information into KeyEvent." 2014-04-29 22:31:06 +00:00
Dianne Hackborn
3e77bb8331 Merge "Add IBatteryStats API to retrieve current charge times." 2014-04-29 21:54:58 +00:00
Dianne Hackborn
ab5c0ea43c Add IBatteryStats API to retrieve current charge times.
Also include charge/discharge information in dumpsys.

Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
2014-04-29 14:53:32 -07:00
Jinsuk Kim
c79224e4b7 am 60037302: am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
* commit '60037302208be033442cc3f3c50a25c7064ebbd1':
  Move logical address allocation logic into native service from HAL
2014-04-29 21:38:19 +00:00
Jinsuk Kim
6003730220 am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
* commit '8fe27e881851921a90882f7d4da142bf936c5549':
  Move logical address allocation logic into native service from HAL
2014-04-29 21:35:01 +00:00
Jinsuk Kim
8fe27e8818 Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev 2014-04-29 21:32:50 +00:00
Kenny Root
a8e65fd82a Only remember the signer certificates for Signatures
Previously we would use the JarEntry#getCertificates API which would
return a flattened array of all the signers and their certificate chain.
Since this isn't what was intended, switch to reading the certificate
chains and only paying attention to the signer certificate.

In order to migrate during upgrades of the platform, we'll scan on boot
with a compatibility mode which will check the stores signatures in the
old format by flattening the chains of the scanned packages then
comparing the two sets.

Bug: 13678484
Change-Id: I02a5c53121d8d6f70a51d7e3b98168a41e11482e
2014-04-29 11:08:50 -07:00
Jae Seo
19db0f036a Merge "Dispatch input events to the TV input" 2014-04-29 06:22:00 +00:00
Jae Seo
6a6059a29e Dispatch input events to the TV input
TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.

Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
2014-04-29 14:18:55 +09:00
Winson Chung
648c83b4ee Fixing NPE. (Bug 14385152)
Change-Id: Ie6d1e7c3e5dcf721e945c4933c077fa6abb10067
2014-04-28 15:11:56 -07:00
Michael Wright
337d9d2edc Move key attribute information into KeyEvent.
This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
2014-04-28 14:33:40 -07:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Christopher Lane
6d50c3ff88 Merge "Fix incorrect "listener no longer active" errors" 2014-04-28 19:24:07 +00:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Jeff Sharkey
33417df78a Fix OEM native library path bug.
Bug: 13340779
Change-Id: I3d69b3453d3d284295bbfa771e6fb4a36bca05c5
2014-04-28 08:54:17 -07:00
Jeff Sharkey
28f0877073 Allow custom wallpaper and boot animation.
Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources.  Falls back to bundled resources when properties are
undefined.

Also look for boot animation under OEM partition.

Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
2014-04-28 08:54:17 -07:00
John Spurlock
1c923a386e Force condition provider unsubscribe when exiting zen mode.
Bug:13743109
Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
2014-04-27 17:41:51 -04:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers.
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
2014-04-27 11:36:32 -04:00
Jae Seo
31dc634be3 Log watched TV programs
Change-Id: Id6ee87dffcf90f10f1619e849126c66ad27464e2
2014-04-26 22:25:45 +09:00
Christopher Lane
5a577903d3 Fix incorrect "listener no longer active" errors
Was incorrectly using .indexOfValue to search for Integer objects in the
client map.

Change-Id: I54e2e1725e0fff0a7d35a22376714cc8266a9eee
2014-04-25 18:57:23 -07:00
Craig Mautner
e361268e6e am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit 'cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
  Throw exception from startActivity if not allowed.
2014-04-25 22:10:12 +00:00
Kenny Root
a466b101be Merge "PackageManager: add versioning to packages.xml file" 2014-04-25 22:09:25 +00:00
destradaa
08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 2014-04-25 21:21:37 +00:00
Winson Chung
4553b2d7c8 Merge "Updating recent tasks list in response to package events. (Bug 14260718)" 2014-04-25 20:22:31 +00:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
2014-04-25 18:45:06 +00:00
destradaa
cc972725af Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
2014-04-25 11:39:16 -07:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed.
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
2014-04-25 11:20:01 -07:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Winson Chung
8faa342c8a Updating recent tasks list in response to package events. (Bug 14260718)
Change-Id: I7e887256b2d504aebfaedcfebb5ee8a40b05fe24
2014-04-25 10:53:57 -07:00
Dianne Hackborn
522ff52f88 Merge "Initial implementation of new voice interaction API." 2014-04-25 17:02:19 +00:00
John Spurlock
7340fc8665 Introduce condition provider services.
Add the condition provider interface, base class, and associated
system metadata.

Pull out common service management code into a reusable helper,
used by notification listeners and condition providers. The
helper, ManagedServices, is now completely self-contained - it
has no dependencies on NoMan or NoMan abstractions.

Bug:13743109
Change-Id: I6856d40f0a2ead78ac9b5707568559a57e7eb009
2014-04-25 12:35:31 -04:00
Kenny Root
c1c0d3c4f4 PackageManager: add versioning to packages.xml file
During development, a new feature might be added that requires the
packages.xml format be updated. To that end, add a database version
attribute that allows this to happen.

Change-Id: I3340a0bd55017acd625c3cba523cec10a18a4805
2014-04-25 09:08:32 -07:00
Jungshik Jang
a77f358eed Merge "Implement skeleton of new HDMI Control Service." 2014-04-25 14:09:18 +00:00
Craig Mautner
3ce4bd3e71 am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev
* commit 'e5889679f69c93f85bca9e94710d5e60a0b1a629':
  Too soon.
2014-04-25 03:10:13 +00:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
2014-04-25 03:01:40 +00:00
Dianne Hackborn
91097de49b Initial implementation of new voice interaction API.
This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it.  It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.

Includes a sample app that is a voice interation service
and also has an activity it can launch.

Now that I have this initial implementation, I think I
want to rework some aspects of the API.

Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
2014-04-24 17:48:58 -07:00
Craig Mautner
400988b69c am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit 'fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
  Add test for attribute android:allowEmbedded
2014-04-25 00:44:56 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
2014-04-25 00:42:25 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
2014-04-24 23:59:05 +00:00
Dianne Hackborn
898be168bd Merge "Add support for muliple active development codenames." 2014-04-24 23:43:49 +00:00
Jungshik Jang
0792d37385 Implement skeleton of new HDMI Control Service.
HdmiCecService is a system service handling HDMI-CEC features
and command. Recently we found out that industry has more
requirements to support HDMI-CEC. Also, MHL is another
standard should be in our pocket. Basically, MHL is
a standard to support communication between mobile device
and TV or Av device. As CEC is a control standard over HDMI
cable, MHL has control channel for peer device.
There behavior is very similiar. Both have commands that
can change Tv's current input and can send/receive key
to other device to control other deivce or TV.

In order to cover both CEC and MHL, current HdmiCecService
implementation has limitation. We had several
session of discussion and decided to refactor
HdmiCecService into HdmiControlService.
For each standard it will have separate controller instance
like HdmiCecController and HdmiMhlController.

In this change I didn't touch original HdmiCecService
because some component, like cast receiver, uses HdmiCecService.
For a while we will keep HdmiCecService until HdmiControlService
accomodates all features of HdmiCecService.

Change-Id: I5485280ab803dbf071d898bfbe34be0b11ce7958
2014-04-25 08:37:51 +09:00
Christopher Tate
12e7512690 Merge "Fix native-lib dir assignment & updating" 2014-04-24 23:28:41 +00:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00