35757 Commits

Author SHA1 Message Date
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
2014-04-04 15:21:53 -04:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
2014-04-04 17:42:44 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
2014-04-04 10:26:05 -07:00
Jeff Brown
8db6d9af58 Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3 Clean up certain state transitions in DreamService.
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately.  This ensures that the dream is actually in the
expected state when the callback runs.  Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior.  As it happens, there's no need
to post this callback since attach() already runs on the UI thread.

Handle certain races involving the window token lifecycle a little
better.  When the dream manager shuts down a dream, it removes the
window token.  This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown.  We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.

Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.

Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
2014-04-02 20:17:32 -07:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
2014-04-03 07:59:27 +09:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Jinsuk Kim
4e90fcd190 Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

    - Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
      can be queried by clients.

    - Defensively check the availability of HdmiCecService so that
      HdmiCecManager.getClient() returns null in case the service couldn't
      be initialized. This ensures clients of the service gets the nulled-out
      HdmiCecClient when called in the state/configuration where the service
      is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
2014-04-02 14:46:14 +09:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix.
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Michael Wright
d08c864784 Add InputDevice#supportsSource(int).
This mirrors the InputEvent#isFromSource API.

Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
2014-03-28 12:59:34 -07:00
John Spurlock
5579ec33eb DO NOT MERGE Enhance the NotificationListenerService api.
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
Wei Wang
f3f52b1b4c Add comment of using same callback for start/stop advertising.
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
2014-03-27 19:34:46 -07:00
Michael Wright
1b10869f39 Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.

Bug: 11480300
Change-Id: Ib18c99b94ac555104c69eac526860aa501e89e03
2014-03-26 14:56:07 -07:00
Michael Wright
1e3c93975e Adds API for determining confirm and cancel keys.
Bug: 13624048
Change-Id: I9f42eeb9c3a6bdae35eb0d7213fb4ac0fd8dc0d9
2014-03-26 14:40:42 -07:00
Andre Eisenbach
580b0a1302 LE: Add API to configure MTU for a given connection (3/4)
bug:13571470
Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
2014-03-25 18:02:06 -07:00
Eino-Ville Talvala
55a1e78fbd am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
2014-03-25 20:11:12 +00:00
Eino-Ville Talvala
1555cec2e5 am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit 'ecad0541a6e90b98ad96456c4e6992121ee8a789':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
2014-03-25 19:01:45 +00:00
Eino-Ville Talvala
ecad0541a6 Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 2014-03-25 18:57:08 +00:00
Gabriel Peal
8ee4491dc8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 03:46:17 +00:00
John Spurlock
2b45d84e24 Merge "Unhide Notification kind, rename to category." into klp-modular-dev 2014-03-24 17:38:44 +00:00
Jose Lima
eb2c85df4b Merge "Added isGame application tag to the manifest" into klp-modular-dev 2014-03-24 15:49:18 +00:00
Mark Renouf
a63cd9f424 Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 2014-03-24 15:22:55 +00:00
John Spurlock
cf44a124ab Unhide Notification kind, rename to category.
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
2014-03-24 11:02:36 -04:00
Jinsuk Kim
c01e1aeb0d Merge "Add HdmiCecManager" into klp-modular-dev 2014-03-23 23:24:44 +00:00
Jinsuk Kim
fbcd503645 Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
2014-03-24 08:19:39 +09:00
Gabriel Peal
e05077d78c am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '83da75d938d519bbcffb9c3b52802fd2daad4aee':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-22 23:35:00 +00:00
Gabriel Peal
83da75d938 Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:

Added some APIs to ITelephony and created a first party framework for them

toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)

Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
2014-03-22 13:33:43 -07:00
Igor Murashkin
965bed1c2c DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
2014-03-22 01:36:54 +00:00
Jose Lima
12d0b4cd96 Added isGame application tag to the manifest
Added the ability to flag applications as Games in the manifest,
so they can receive a different treatment in the UI.

Change-Id: I4c36bc1a96757030fad58ee050cd68491b31bb6c
2014-03-21 15:14:45 -07:00
Chad Brubaker
c772614714 am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '1fce89d946760a1bcf3a733f55494f963eab00c2':
  Include the interface for clearDnsInterfaceForUidRange
2014-03-21 21:02:43 +00:00
Chad Brubaker
1fce89d946 am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit 'de4e7b4947998638e0345ab9a181bf35a8827bef':
  Include the interface for clearDnsInterfaceForUidRange
2014-03-21 20:56:37 +00:00
Chad Brubaker
de4e7b4947 Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 2014-03-21 20:52:05 +00:00
Unsuk Jung
2270ac96d5 am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
  Change wallpaper sizing
2014-03-21 19:11:01 +00:00
Unsuk Jung
8114c3d02d am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
  Change wallpaper sizing
2014-03-21 19:05:40 +00:00
Michael Jurka
3368a63c64 Change wallpaper sizing
Bug: 11997581

- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
2014-03-21 10:29:27 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Wei Wang
32779536bc am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit '13bd85772f6279d14303ec3a18615613c3722844':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 16:59:13 +00:00
Jinsuk Kim
4f512fb451 Add HDMI-CEC service
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
2014-03-20 16:40:22 +09:00
Wei Wang
13bd85772f am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 03:41:47 +00:00
Wei Wang
d10bc171a5 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '15a18d07acc57d465e9d67bb28010912bb9ad15f':
  DO NOT MERGE:  Add status callback for start/stop advertising.
2014-03-20 03:36:45 +00:00
Wei Wang
15a18d07ac am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
  DO NOT MERGE:  Add status callback for start/stop advertising.
2014-03-20 03:32:17 +00:00
Wei Wang
c0384b6b18 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050
Cherrypick from master to fix b/13289050

Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
2014-03-19 20:31:36 -07:00
Wei Wang
4b4eebb9a5 DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/13289050

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java
2014-03-20 00:33:41 +00:00