drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,905 Commits 1 Branch 0 Tags
Commit Graph

23502 Commits

Author SHA1 Message Date
Craig Mautner
07d2f0cff4 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:58:00 +00:00
Craig Mautner
f1eb1cdc65 am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'd22c8d9961340ba1b7d7601d1c99e2557b6a9f0b':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:12:33 +00:00
Craig Mautner
1388342c7f am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '088bf3a37a329962efb5e5a42c82f32a2dab77fe':
  More debugging for bug 17721767
 2015-01-20 23:12:29 +00:00
Craig Mautner
d22c8d9961 Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 2015-01-20 23:07:56 +00:00
Craig Mautner
088bf3a37a Merge "More debugging for bug 17721767" into lmp-mr1-dev 2015-01-20 22:57:42 +00:00
Dianne Hackborn
cff1bbf46c Fix issue #19020826: Including timing issues in ANR reason breaks clustering 
Also improve service ANR debugging.

Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb
 2015-01-20 14:56:09 -08:00
Craig Mautner
6673d09a8a Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 
automerge: 03d7cc3

* commit '03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:45:50 +00:00
Craig Mautner
a3342991a7 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
automerge: 07317da

* commit '07317da6834cc35fe8fad519bb60f15ba68bcd48':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:43:32 +00:00
Craig Mautner
03d7cc3c24 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 
automerge: d9a79b5

* commit 'd9a79b5ba9934429289a634bdd4ad1a375484184':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:35:57 +00:00
Craig Mautner
ea343e5f67 Revert "Remove debugging and skip InputMethod windows" 
This reverts commit 668cae1d4724cf794571f1ee2a3e896984b97db7.

Too soon. I need this for debug.

Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b
 2015-01-20 22:35:25 +00:00
Craig Mautner
d9a79b5ba9 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 2015-01-20 22:34:01 +00:00
Craig Mautner
07317da683 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:32:16 +00:00
Craig Mautner
cbb286b859 Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 2015-01-20 22:26:11 +00:00
Craig Mautner
0c4d81cf13 Do not defer removal for empty tasks or activities 
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
 2015-01-20 13:57:27 -08:00
Christopher Tate
a9c122af60 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb 
automerge: 5afc62c

* commit '5afc62cd39403c12a253101b12c52f440843bdaf':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:45:08 +00:00
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
f5f54dd691 am 92dd1abe: Update restored task uid to match the package uid on current device. 
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:10:01 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Craig Mautner
94ab46659b More debugging for bug 17721767 
Narrow down why GEL is being resumed instead of the top stack.

Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
 2015-01-20 10:52:53 -08:00
Wonsik Kim
b2b85f9576 TIF: TvInputHardwareManager puts multiple sink ports into audio patch 
Bug: 18823504
Change-Id: Id1dfe6c87bb26a8cb3ffafae8b256fa9e87d9d8c
 2015-01-20 06:40:25 +00:00
Jinsuk Kim
1951fc3667 am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit 'd38f077b10f1d6885834805bed1ec093f6ea8fe0':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:53:19 +00:00
Jinsuk Kim
a73cbecef2 am 4d37a358: am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit '4d37a3584cbdf9a2e73887b645950d30a0ce38ce':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:53:13 +00:00
Jinsuk Kim
d38f077b10 am 5b8cb00b: CEC: Process new options for CEC/MHL HAL 
* commit '5b8cb00b8a302329b98a5528eaa7934d0f5c3e65':
  CEC: Process new options for CEC/MHL HAL
 2015-01-19 02:25:48 +00:00
Jinsuk Kim
4d37a3584c am bbfec56d: Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 
* commit 'bbfec56dfcb1fdcb0307b3df83e2ad855c0b0b88':
  CEC: Make TV try to allocate logical address 0 first
 2015-01-19 02:25:44 +00:00
Jinsuk Kim
5b8cb00b8a CEC: Process new options for CEC/MHL HAL 
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.

2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.

Bug: 19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
 2015-01-19 02:22:05 +00:00
Jinsuk Kim
bbfec56dfc Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 2015-01-19 02:20:18 +00:00
Jinsuk Kim
d47abefc82 CEC: Make TV try to allocate logical address 0 first 
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.

Also included are small changes:

- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path

Bug: 19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
 2015-01-19 10:44:38 +09:00
Robert Greenwalt
51481857ea Fix legacy request removal. 
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.

bug:18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7
 2015-01-16 16:06:39 -08:00
Craig Mautner
668cae1d47 Remove debugging and skip InputMethod windows 
1. Remove debug for bug 17721767.
2. When adding activity windows based on base layer skip over
InputMethod windows.

Change-Id: I3600e9acd997002ce87d34df2af577cc7b648480
 2015-01-16 15:29:18 -08:00
RoboErik
b2949e1b95 am 694940be: am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit '694940be699165aedc05d5f1ae9381cd61a368a7':
  Notify the system of all remote volume changes
 2015-01-16 23:08:32 +00:00
RoboErik
694940be69 am d5ff63ba: Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 
* commit 'd5ff63ba0ce8597155e0201fd20fe18fbf0aa053':
  Notify the system of all remote volume changes
 2015-01-16 23:04:10 +00:00
RoboErik
d5ff63ba0c Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 2015-01-16 22:56:54 +00:00
Craig Mautner
62e815bf7b am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
  More debugging for bug 18201239.
 2015-01-16 21:07:13 +00:00
Craig Mautner
02c7c97a62 am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
  More debugging for bug 18201239.
 2015-01-16 21:01:25 +00:00
Craig Mautner
ac70b2d172 Merge "More debugging for bug 18201239." into lmp-mr1-dev 2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9 More debugging for bug 18201239. 
Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
 2015-01-16 12:52:54 -08:00
RoboErik
9c5b7cb048 Notify the system of all remote volume changes 
If a volume change occurred because it was sent through the MediaController directly
it wasn't showing the system's volume UI. This fixes things so the volume slider gets
shown for all volume requests with the SHOW_UI flag set.

bug:19036130
Change-Id: I1f7cb2e03386e2f3f7bc448cb4c38a71573775ff
 2015-01-16 17:57:33 +00:00
Kenny Guy
4be433dc0b am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit '10dd6eeff86a0618fa2984ae14aafde182f9da9d':
  Sync file before using JournaledFile commit.
 2015-01-16 11:31:13 +00:00
Kenny Guy
10dd6eeff8 am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.
 2015-01-16 11:24:56 +00:00
Kenny Guy
fd846dfbf1 Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 2015-01-16 11:21:19 +00:00
Jinsuk Kim
1122d5e760 am 6821efc6: am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '6821efc66f2550bf9cb0d1067462ea10fafe72b9':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:29:06 +00:00
Jinsuk Kim
c7f3679416 am 2bf3b2c4: am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '2bf3b2c49c28d028ff615ba49cc876da8ae02fc3':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:23:33 +00:00
Jinsuk Kim
6821efc66f am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:23:05 +00:00
Jinsuk Kim
2ab6d9fff3 CEC: Do not send <Active Source> when TV wakes up by one touch play 
TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e
 2015-01-16 17:18:36 +09:00
Jinsuk Kim
2bf3b2c49c am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '964c00dd7b270dcf80aea3450bbfc23502965cce':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:17:07 +00:00
Jinsuk Kim
964c00dd7b CEC: Buffer Cec messages while allocating logical address 
CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa
 2015-01-16 16:18:32 +09:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Christopher Tate
cf96260118 Don't write widget metadata to backup unless it's new/changed 
Redundant backup traffic is bad.  Don't commit the widget metadata payload
(or the deletion operation for it) unless the widget state of the app has
actually changed since the last backup.

Bug 19003911

Change-Id: I93819173c0e2357b030d9e2b3d2ee57f2410bb57
 2015-01-15 17:37:06 -08:00