21543 Commits

Author SHA1 Message Date
Craig Mautner
e9d65deb3d am 2abc8aa0: am 105e8f3e: Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev
* commit '2abc8aa032c5e4d7caaac196c1ecb5bb57d459bd':
  Fix dumpsys display apptoken ordering.
2014-10-23 15:58:27 +00:00
Craig Mautner
d39c01c93c resolved conflicts for merge of 933d807c to lmp-mr1-dev-plus-aosp
Change-Id: I183baf510e084e07244a8583c0bd162cd9715b50
2014-10-23 08:48:36 -07:00
Bryce Lee
1d9184035d am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev
* commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95':
  [Theater Mode] framework implementation through global setting
2014-10-23 08:01:57 +00:00
Craig Mautner
b9b62b06bb am 52656916: am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"
* commit '52656916e35b08013bf776b3603d6cecba287a1e':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
2014-10-23 03:17:35 +00:00
Craig Mautner
105e8f3e9b Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 2014-10-23 00:26:06 +00:00
Craig Mautner
74ff66e26a am 5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev
* commit '5cd68ee4dfeaf74a31a0a62e5d0a60951cddc3bc':
  Cherry pick task movement changes from aosp
2014-10-23 00:13:57 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
2014-10-22 16:56:08 -07:00
Wale Ogunwale
cbe7f81819 am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev
* commit '1546422ea7b0c62e6205ab9e85a370caf1d01756':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
2014-10-22 22:39:35 +00:00
Wale Ogunwale
d0aae5a222 Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 2014-10-22 22:17:19 +00:00
Adrian Roos
0c68420eb4 am 3768d224: am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents
* commit '3768d22417a8efd3e6501486cfb6e042f7a40227':
  Delay discovery of system trust agents
2014-10-22 21:18:03 +00:00
Adrian Roos
96d3132bd0 am c19586a8: am 7b4a38b1: Delay discovery of system trust agents
* commit 'c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
  Delay discovery of system trust agents
2014-10-22 20:45:26 +00:00
Craig Mautner
5cd68ee4df Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 2014-10-22 20:38:06 +00:00
Christopher Tate
44d7556bfa am 339f0a57: am 6ab86274: Merge "Don\'t cancel scheduled jobs when packages are updated" into lmp-mr1-dev
* commit '339f0a57d46447b1bd9286b8f891686f80b746a4':
  Don't cancel scheduled jobs when packages are updated
2014-10-22 20:37:15 +00:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
Craig Mautner
cbd84af39a Cherry pick task movement changes from aosp
The following cherry picks from aosp contain code that keep windows
tracking the task movement.

https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930

Maybe fixes bug 15729183.

Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
2014-10-22 13:28:40 -07:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
2014-10-22 11:16:33 -07:00
Craig Mautner
e8b85fd419 Fix dumpsys display apptoken ordering.
Ordering was bottom up stack ordering but top down apptoken ordering
within each stack. This makes it top down ordering throughout the
dump.

Change-Id: Ie15dbbfc3b21b8df101a0803e556094142dc408e
2014-10-22 09:23:25 -07:00
Wale Ogunwale
cfb2a8d09a am a14f69f5: am f7fb3acf: Merge "Fix issue #17674789: Recents icon resets if persist mode is \'persistNever\'" into lmp-mr1-dev
* commit 'a14f69f5d9a545e8aed17857c57b1ad955fb71da':
  Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
2014-10-22 15:52:41 +00:00
Wale Ogunwale
f7fb3acf8f Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev 2014-10-22 15:43:53 +00:00
Craig Mautner
80a274c696 am 4816ed65: Merge "Debug for bug 18017409" into lmp-mr1-dev
automerge: 880eb34

* commit '880eb34f24fd2550a1051025e13816b76c0b6af1':
  Debug for bug 18017409
2014-10-22 05:25:18 +00:00
Robin Lee
afa5ae5f8d am de7df08c: am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
automerge: bd4f2a4

* commit 'bd4f2a473f41fbebb2b0d537542a54174c80e7db':
  DevicePolicy: Restore CA warning to K behaviour
2014-10-22 05:22:52 +00:00
Craig Mautner
4816ed65c6 Merge "Debug for bug 18017409" into lmp-mr1-dev 2014-10-22 03:01:41 +00:00
Robin Lee
de7df08cda am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit 'fc56790085463ab410a5f407a4930b42509ad5f7':
  DevicePolicy: Restore CA warning to K behaviour
2014-10-22 02:00:38 +00:00
Craig Mautner
5a3c231dc8 Debug for bug 18017409
Log adding and removing windows. Log activity state changes.

Change-Id: I544be89ff9af6b13ffde70dedec291793b46a420
2014-10-21 18:15:20 -07:00
Wale Ogunwale
be23ff4949 Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
Changed TaskPersister worker thread to not delete task information on disk
for tasks that are in recents but not persistable.

Also, changed logic that writes tasks information (excluding thunmbnail)
to disk to not write information for tasks that are not persistable.

Bug: 17674789
Change-Id: Iff7c5d24677f8a75157bb6be504fc2d9d6bcc098
2014-10-21 16:47:58 -07:00
Bryce Lee
584a445179 [Theater Mode] framework implementation through global setting
Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
2014-10-21 15:55:55 -07:00
Adrian Roos
c19586a805 am 7b4a38b1: Delay discovery of system trust agents
* commit '7b4a38b197ce43cb286d80fc6c4e9713b2807f13':
  Delay discovery of system trust agents
2014-10-21 21:43:05 +00:00
Wale Ogunwale
393b1c1e88 Fix issue #17789629: PopupWindow overlaps with navigation bar.
The Lollipop release introduced a feature that allowed
apps to extend under the navigation bar. This also means
any popup window that is anchored to the bottom of its
parent window will overlap with the navigation bar if the
parent window is extending underneath the navigation bar.

This change introduces a new window flag
(FLAG_LAYOUT_ATTACHED_IN_DECOR) that allows the app to
specify if the popup window should be attached to the decor
frame of the parent window thereby avoiding an overlap
with the screen decorations.

By default the flag is set on SDK version LOLLIPOP_MR1 or
greater and cleared on lesser SDK versions.

Also, replaced flags FLAG_NEEDS_MENU_KEY and
PRIVATE_FLAG_NEEDS_MENU_KEY_SET with needsMenuKey state
variable to make room for the new
FLAG_LAYOUT_ATTACHED_IN_DECOR flag.

Bug: 17789629
Change-Id: I2150e0c6ac688c966c0e8f7e54d42fd20285bea6
2014-10-21 12:45:53 -07:00
Craig Mautner
52656916e3 am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"
* commit '4c1010152e487d3471e6703e8a9f8c1010488d47':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
2014-10-21 19:45:41 +00:00
tingna_sung
9dde78f7da Avoid to skip app window due to un-assigned sending to bottom state while app window sort
should assign value of WindowToken.sendingToBottom according to the state of this token is moved to top or bottom
to avoid app window is skiped incorrectly due to sending to bottom state is un-assigned while app window sort
and finding focus window.

Change-Id: I190838d1d01ca229155d5176930178ab41335556
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-10-22 00:07:08 +08:00
Adrian Roos
7b4a38b197 Delay discovery of system trust agents
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.

Bug: 18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
2014-10-21 17:07:41 +02:00
Robin Lee
fc56790085 am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
  DevicePolicy: Restore CA warning to K behaviour
2014-10-21 11:58:38 +00:00
Jinsuk Kim
30ef14e8a5 am 6ec9b4f0: am 17e9d246: Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev
* commit '6ec9b4f09b0baf909a009cf897114bc5a50fbf0c':
  CEC: Add missing protections for some HdmiControlService API
2014-10-20 23:29:50 +00:00
Jinsuk Kim
17e9d2468f Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 2014-10-20 22:50:37 +00:00
Jinsuk Kim
b22d9ee0a3 CEC: Add missing protections for some HdmiControlService API
A few methods are found to be missing protection with system permission.
Add enforceAccessPermission() like other methods.

Bug: 17408780

Change-Id: I58a336b5cc9df2d195bdfe7b928898dde5ff169f
2014-10-21 07:14:46 +09:00
Griff Hazen
22cf018313 am 22b1113e: am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev
* commit '22b1113e0b4ecbf0b2660d642e6cd489c058d76d':
  Disable zen log printouts by default
2014-10-20 21:55:04 +00:00
Griff Hazen
6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default
2014-10-20 21:46:12 +00:00
Griff Hazen
1aad144c8f Disable zen log printouts by default
Bug: 18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
2014-10-20 14:02:59 -07:00
Robin Lee
e69bdca44b DevicePolicy: Restore CA warning to K behaviour
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.

Bug: 17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
2014-10-20 20:55:40 +00:00
John Spurlock
6cae74a800 am c8a01f35: am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev
* commit 'c8a01f353e957ee26d9f5624f32df6005ed03f21':
  Qualify private outer call in MediaProjectionManagerService.
2014-10-20 20:25:20 +00:00
John Spurlock
3babc728e0 Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 2014-10-20 20:15:38 +00:00
John Spurlock
9b84309bea Qualify private outer call in MediaProjectionManagerService.
Change-Id: Ia4e09bdfe773a27107c0980a1aabf9b09e2b0a46
2014-10-20 13:37:48 -04:00
Adrian Roos
4e2c298876 am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
* commit '2f6fd874510cd333f7fc0b08e146d5d069fa2013':
  Retire RecentApplicationsDialog
2014-10-20 13:15:40 +00:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Yuncheol Heo
26ea56b3c5 am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
* commit '5814bf1c7bc4b8abed781c1667305d843e7079fb':
  CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:19:49 +00:00
Yuncheol Heo
0608b9328b CEC: Add a callback for vendor when HDMI control setting is changed.
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
  distinguish whether the message is broadcast or not.

Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
2014-10-20 16:47:24 +09:00
Jinsuk Kim
dcc8004377 am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev
automerge: f5e6935

* commit 'f5e693510153ecf855d7d2d807bd36b1bd9be28c':
  CEC: add getDeviceList()
2014-10-20 03:28:32 +00:00
Jinsuk Kim
7a78e578d7 Merge "CEC: add getDeviceList()" into lmp-mr1-dev 2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74 CEC: add getDeviceList()
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.

For this, turned the local device address list to unmodifiable so that it can
be used by any threads.

Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.

Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
2014-10-20 11:32:47 +09:00
Dianne Hackborn
019de15ca2 am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
  Fix issue #17948288: Improve accuracy of memory use reporting
2014-10-18 00:52:07 +00:00