Prerepa Viswanadham
e30c840bc4
am 94294b1c: am 33813e73: am 2792be93: OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
...
* commit '94294b1cbf1db48cc7ed24d6aa5c2274ce1cebc1':
OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
2014-08-08 02:22:38 +00:00
Christopher Tate
a589f12c34
am b39bc60c: am 6fb63e97: am bc835105: Merge "Reify the transport lookup/selection API" into lmp-dev
...
* commit 'b39bc60c4a255a6dd4eaa3e4b92394bff22ac4d3':
Reify the transport lookup/selection API
2014-08-08 02:22:33 +00:00
Christopher Tate
6c7ec13836
am 8131a5dd: am 1a0066b6: am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev
...
* commit '8131a5dd42e441420cf99b99e152ee1510feabf2':
Make TrafficStats uid attribution @SystemApi
2014-08-08 02:22:23 +00:00
Christopher Tate
931535cbc7
am 3755910a: am 9d24d44e: am f671005b: Introduce system API for distinguishing the owner user
...
* commit '3755910ad680f88d3eb5d3db78a2fd5e9b36cebb':
Introduce system API for distinguishing the owner user
2014-08-08 02:22:16 +00:00
Dianne Hackborn
bd0e0e2ed6
am 23a2f922: am f1de7d98: am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev
...
* commit '23a2f922fadade5a29ff93a2c304b6c89eeaa84f':
Fix to call VoiceInteractionSession.onDestroy().
2014-08-08 02:22:11 +00:00
Dianne Hackborn
5a6aaf7bcf
am d9b3fab2: am d741140f: am e46717b6: Fix issue @16555033: Battery history overflowing too much
...
* commit 'd9b3fab2bdd9c0c42807d03e8b133deb7337bfb3':
Fix issue @16555033: Battery history overflowing too much
2014-08-08 02:21:57 +00:00
Sandeep Siddhartha
140dd87333
am 22a3c9e6: am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev
...
* commit '22a3c9e6d899197f772837dabb810a539d3782ac':
Handle microphone contention/Phone calls while recognition is active
2014-08-08 02:21:46 +00:00
Prerepa Viswanadham
d5324e4183
OnLost/OnFound integration - onfound match is done in framework,
...
whereas hw signal is used to report onlost.
Bug 16733710
Change-Id: I7b177b7afd730341c336818857436c095735b53b
2014-08-07 19:51:59 +00:00
Christopher Tate
cbd7a6ecbb
Introduce system API for distinguishing the owner user
...
Support services that special case the owner but are instantiated
per-user, and so need to be able to distinguish.
Bug 16661321
Change-Id: I7ff5168c91e39821317fdf5cfaba34e90d30de95
2014-08-07 19:43:17 +00:00
Dianne Hackborn
0068d3dcf1
Fix issue @16555033: Battery history overflowing too much
...
- No longer track process starts/stops normally.
- Increase buffer size to 256KB.
- Buffer size increase requires reworking how battery stats
are retrieved, since it is going to be hitting IPC limits.
- Also, store the last full stats after a reset, to be reported
at the next checkin.
- Also, discharge and charge times are tagged with the screen
and battery save state during that time.
Change-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16
2014-08-07 12:19:39 -07:00
Winson Chung
38c010dd05
am 06e564d2: am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev
...
* commit '06e564d23309dc1c5198eda98e975b7fc5f00c61':
Initial changes to add task affiliation styling. (Bug 16656169)
2014-08-07 19:17:19 +00:00
Glenn Kasten
b8ade1e976
am 7bffa188: am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
...
* commit '7bffa188c6cfc180b0efea2e7d00b73088acb875':
Add setting to disable automatic USB audio routing
2014-08-07 19:17:14 +00:00
Sandeep Siddhartha
4f5e1baa11
am 2c28164d: am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev
...
* commit '2c28164df8c56ff26b4b0f045d40fb756697b44d':
Read audio format from the recognition event
2014-08-07 19:17:05 +00:00
Adam Powell
0ee1e2436e
am a653ca15: am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView
...
* commit 'a653ca1573f13a496d2fe163f2c1d58523a8fa41':
Nested pre-fling for AbsListView and ScrollView
2014-08-07 19:17:00 +00:00
Dianne Hackborn
9a35d78cad
Fix to call VoiceInteractionSession.onDestroy().
...
Change-Id: I2b4f19538700c691dac3a83aadfa0959ef1fe458
2014-08-07 12:34:37 -07:00
Adam Powell
9413b245a6
Nested pre-fling for AbsListView and ScrollView
...
Add nested pre-fling support to all framework widgets that currently
support nested fling.
Change-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96
2014-08-07 10:24:04 -07:00
Kenny Guy
3bf8cde681
am 7fe2cf88: am adc7bb3f: am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev
...
* commit '7fe2cf88f658408cb86425606f2a4b424b27e276':
Revert "Remove String version of getBadgedLabel"
2014-08-07 17:10:25 +00:00
Kenny Guy
a1b2a1e732
am deff5997: am 7f153ded: am 1f98d304: Remove LauncherApps method left for compat.
...
* commit 'deff599796014960b03a817e8b6732d35665df08':
Remove LauncherApps method left for compat.
2014-08-07 16:26:46 +00:00
Kenny Guy
db02e7b718
am 8a2d844e: am 1c06b2d0: am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev
...
* commit '8a2d844eb8cad6dc4ef65ebe333319aeb6899245':
Remove String version of getBadgedLabel
2014-08-07 16:21:26 +00:00
Kenny Guy
65810072d6
Remove LauncherApps method left for compat.
...
Method was left while updating unbundled apps
which have now been updated.
Bug: 16864685
Change-Id: I687cb23a1b60b88eeb988f3cf2604dc24b739121
2014-08-07 16:09:10 +00:00
Sandeep Siddhartha
cb4e81c7fe
Handle microphone contention/Phone calls while recognition is active
...
Internally we pause the recognition when:
- a phone call is active/off-hook/ringing
- or some other application grabs the microphone
we auto-resume when the condition that caused us to pause reverses.
Both these events are notified to the client via callbacks so that they can choose to display on their UI,
that the recognition is paused for some reason.
Bug: 16515468
Bug: 16740806
Bug: 16514535
Change-Id: Ib274d68522c8cf37d42402c875b16159957657f0
2014-08-07 11:53:02 -07:00
Sandeep Siddhartha
a13104fe7d
Merge "Read audio format from the recognition event" into lmp-dev
2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
2178e2e085
Read audio format from the recognition event
...
Bug: 16549061
Change-Id: I9e418f7be67eb330b7bfaa97bbb90d0b5640469d
2014-08-07 10:48:51 -07:00
Winson Chung
57c84544d9
Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev
2014-08-07 15:27:35 +00:00
Winson Chung
ec396d6399
Initial changes to add task affiliation styling. (Bug 16656169)
...
- Fixing issue with launch-in-background animation
2014-08-07 17:57:25 +00:00
Christopher Tate
3432720bf9
Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev
2014-08-07 15:00:45 +00:00
Christopher Tate
a2496de37a
Make TrafficStats uid attribution @SystemApi
...
Anything that runs as a singleton may need to attribute traffic to
various client apps; in particular, backup transports need to do this.
Apropos of which, introduce a @SystemApi method specifically for that
purpose, setThreadStatsTagBackup().
Bug 16661321
Change-Id: Id5d22e28bdc68edb53f2a1fdba80b144fcbc61d2
2014-08-07 19:43:20 +00:00
Kenny Guy
ae267d20c6
Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev
2014-08-07 09:28:12 +00:00
Kenny Guy
9962f335a1
Revert "Remove String version of getBadgedLabel"
...
This reverts commit ed0096c14ae1b17845bc9bb8fbb1cdc47adfdd68.
Change-Id: If026db7e804be81aaa02cfd2a4e1a0a03ee020f1
2014-08-07 16:48:06 +00:00
Kenny Guy
4a4f275f24
Remove String version of getBadgedLabel
...
It was left to allow unbundled apps time to update.
Bug: 16484455
Change-Id: Ibae2576ac7fc88000ec81c669e66536aaa2e3e79
2014-08-07 11:28:48 +00:00
Christopher Tate
bcc48b6cb0
Merge "Reify the transport lookup/selection API" into lmp-dev
2014-08-06 23:49:20 +00:00
Christopher Tate
d5cf722ae6
Reify the transport lookup/selection API
...
Introduce a stable BackupTransport interface class for transport
implementations to derive from.
Make the interface for viewing/selecting the active backup transport
part of the stable API.
Make restore-related classes (RestoreSession, RestoreSet) stable API.
Express backup manager APIs needed for transport operation as
@SystemApi methods in BackupManager.
Bug 16661321
Change-Id: I423b87ae8f45c1b77831d4f8ffd97715484c2d2b
2014-08-07 19:43:22 +00:00
Barnaby James
8f610f4538
Merge "Fix VoiceInteractionService.isActiveService."
2014-08-06 23:49:20 +00:00
Chet Haase
7fb80a7aa5
am f05ef04c: am b965512b: am 95aab922: Allow TimePicker/DatePicker to use legacy layout style
...
* commit 'f05ef04c0f3707727e458065c8edc54afddabc25':
Allow TimePicker/DatePicker to use legacy layout style
2014-08-07 14:41:01 +00:00
Chet Haase
3053b2fdcf
Allow TimePicker/DatePicker to use legacy layout style
...
In L, the TimePicker was rewritten to use a clock face and the
DatePicker was rewritten to use a calendar. This
change allows developers to opt into the old style instead
(android:timePickerMode="spinner|clock" and
android:datePickerMode="spinner|calendar").)
Issue #16717952 Pre-L style android.widget.TimePicker on L
Issue #16846963 Allow developer to use legacy DatePicker appearance
Change-Id: I4ee071fcbc5bf25eab83d6a5cb6ff352a603f90a
2014-08-07 14:28:49 +00:00
Dan Sandler
91b9715b43
am 74746c7e: am 11dff416: am a20ca819: Merge "Need to post-process all action icons to get the correct color." into lmp-dev
...
* commit '74746c7e1440fe3ab2a8939b9c75e70b3d3bf258':
Need to post-process all action icons to get the correct color.
2014-08-07 14:25:00 +00:00
Adrian Roos
afc625a679
am 06407eb4: am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev
...
* commit '06407eb441b71d0dd62f38cef72aba140944b711':
Pass initiatedByUser to TrustListeners
2014-08-07 14:09:33 +00:00
Zoltan Szatmary-Ban
5576e855bf
am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev
...
* commit '084a11612dd1b1958f4421315e3929657723f7c9':
Revert "Update Trusted Credentials screen in settings"
2014-08-07 13:53:10 +00:00
Zoltan Szatmary-Ban
bdbd4a55ef
am d9d6bfe9: am d76cefa2: am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev
...
* commit 'd9d6bfe92f37b7ba82c3ad1f5a28ad16ee67e221':
Update Trusted Credentials screen in settings
2014-08-07 13:53:05 +00:00
Adrian Roos
3c9a350165
Pass initiatedByUser to TrustListeners
...
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
2014-08-07 15:13:09 +02:00
Zoltan Szatmary-Ban
138b324d5d
Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev
2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93
Revert "Update Trusted Credentials screen in settings"
...
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.
Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
2014-08-07 13:41:08 +00:00
Dan Sandler
09723fd04a
Merge "Need to post-process all action icons to get the correct color." into lmp-dev
2014-08-07 09:28:12 +00:00
Svetoslav
2657a6775c
am 67ed0367: am 2b2e19fd: am 903f1840: Fix cross-user talk.
...
* commit '67ed03675961971052c93a2918adaf88e2a70203':
Fix cross-user talk.
2014-08-07 05:28:19 +00:00
Svetoslav
985e566cec
Fix cross-user talk.
...
An app can access widgets hosted or provided by its uid and package.
Access is also allowed if the caller has the bind app widgets permission
but this caller can be in the wrong user. Now the caller should not
only have the bind app widget permission but also be in the same user
as the host or the provider of the widget.
bug:16834230
Change-Id: I5ddb6309f63f2b4ba95360446c2b9584350fb66f
2014-08-07 05:14:36 +00:00
Jungshik Jang
2fb84d2ef4
am 09aa014e: am 09ae74da: am f3d00918: Merge "Rename HdmiCecDeviceInfo into HdmiDeviceInfo." into lmp-dev
...
* commit '09aa014e09870fc6f6e15e105d3b43d6371edd25':
Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
2014-08-07 02:56:05 +00:00
Paul Jensen
e8f0ddc5a9
am a3b258aa: am 3539fbed: am f98c63e9: Merge "Revert DNS cache flush command deletion from "Cleanup: Delete dead code."" into lmp-dev
...
* commit 'a3b258aa389c7ecf2f3aa7acb4fa9b619b26afd4':
Revert DNS cache flush command deletion from "Cleanup: Delete dead code."
2014-08-07 02:46:48 +00:00
Paul Jensen
183d81679a
am 6d5b3718: am d2ff5f51: am 776f1902: Remove dead CaptivePortalTracker.
...
* commit '6d5b3718bb5b5bb9aeac3cf92c6fbc730c1021a6':
Remove dead CaptivePortalTracker.
2014-08-07 02:46:37 +00:00
Paul Jensen
ab14df37ab
Remove dead CaptivePortalTracker.
...
Captive portals are now detected by the NetworkMonitor.
Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
2014-08-07 02:32:54 +00:00
Alan Viverette
62add8db0f
am 583db6d3: am d840c144: am cb0fc1e5: Preserve surface insets when view layout is updated
...
* commit '583db6d3f6965fe1a3ca840d2024c18be3733792':
Preserve surface insets when view layout is updated
2014-08-07 01:17:27 +00:00