summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "Use text ascent / descent to center SimpleMonthView labels"Alan Viverette2015-01-082-19/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use text ascent / descent to center SimpleMonthView labelsAlan Viverette2015-01-082-19/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updates Canvas.drawText() docs to clarify that the y-origin is actually the baseline rather than the top (which is what developers expect). BUG: 18864682 Change-Id: Ibfa2a79327d17b5135f90468195fbeca922a25c8
* | | | | | | | | | | | | | | Merge "Replace sleep() hack with vsync listening"John Reck2015-01-083-30/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Replace sleep() hack with vsync listeningJohn Reck2015-01-063-30/+83
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4eb744d9a5abe40cf4f8bbaafa03e59b7360608a
* | | | | | | | | | | | | | | am f5dcb6cb: am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored ↵Christoph Studer2015-01-081-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification" into lmp-mr1-dev automerge: bbadf11 * commit 'f5dcb6cbb9db1099e458b9a7df0a21baffbf77cc': NoMan: Cancel previous instance of ignored notification
| * | | | | | | | | | | | | | am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" ↵Christoph Studer2015-01-081-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: bbadf11 * commit 'bbadf1161aacafd80182dda080534a123a7204ef': NoMan: Cancel previous instance of ignored notification
| | * | | | | | | | | | | | | am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" ↵Christoph Studer2015-01-081-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '9d4b7963399045395799dcb7df5d8c84d9b12884': NoMan: Cancel previous instance of ignored notification
| | | * | | | | | | | | | | | Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-devChristoph Studer2015-01-081-3/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | NoMan: Cancel previous instance of ignored notificationChristoph Studer2015-01-061-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a notification is ignored due to notification group optimization, make sure any existing instance of the ignored notification is canceled. Bug: 18914108 Change-Id: Ifcc4833df019ea5cb7048eaab11ae76e7fa2a31c
* | | | | | | | | | | | | | | | am 52657361: (-s ours) Merge "Fix pointer index out of range exception DO ↵Craig Mautner2015-01-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev automerge: 28a4cea -s ours automerge: 7cd49c6 -s ours * commit '52657361d04719f62b9cea57ea9d0e8c780ce874': Fix pointer index out of range exception DO NOT MERGE
| * | | | | | | | | | | | | | | Merge "Fix pointer index out of range exception DO NOT MERGE" into ↵Craig Mautner2015-01-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 28a4cea -s ours automerge: 7cd49c6 -s ours * commit '7cd49c6c3a2678510a278f28514c73dcbaae8957': Fix pointer index out of range exception DO NOT MERGE
| | * | | | | | | | | | | | | | Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-devCraig Mautner2015-01-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 28a4cea -s ours * commit '28a4cea5a0f8d0e33b9d6a3283d31cc1e976c74c': Fix pointer index out of range exception DO NOT MERGE
| | | * | | | | | | | | | | | | Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-devCraig Mautner2015-01-081-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix pointer index out of range exception DO NOT MERGEtingna_sung2015-01-081-0/+1
| | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid pointer index out of range error if return value is -1 of findPointerIndex() when there is no data available for that pointer identifier. Change-Id: I2a08f04c678164e220852094baa124ba157e2e42 Signed-off-by: tingna_sung <tingna_sung@htc.com> Fixes bug 18883936
* | | | | | | | | | | | | | | | Merge "Add new debug feature to track associations between processes. Also ↵Dianne Hackborn2015-01-082-16/+256
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs." into lmp-mr1-dev automerge: a7881fd automerge: 30ae442 automerge: 8fa0935 * commit '8fa0935335ec5b9174e01acf861c58972a72aeab': Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
| * | | | | | | | | | | | | | Merge "Add new debug feature to track associations between processes. Also ↵Dianne Hackborn2015-01-082-16/+256
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs." into lmp-mr1-dev automerge: a7881fd automerge: 30ae442 * commit '30ae442133c55d4aa3636127de556736b2eaa99f': Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
| | * | | | | | | | | | | | | Merge "Add new debug feature to track associations between processes. Also ↵Dianne Hackborn2015-01-082-16/+256
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs." into lmp-mr1-dev automerge: a7881fd * commit 'a7881fd30b973f923c98d53bddf397d744b4229c': Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
| | | * | | | | | | | | | | | Merge "Add new debug feature to track associations between processes. Also ↵Dianne Hackborn2015-01-082-16/+256
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs." into lmp-mr1-dev
| | | | * | | | | | | | | | | | Add new debug feature to track associations between processes. AlsoDianne Hackborn2015-01-072-16/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some debugging for spurious service ANRs. Bug: 18201239 Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
* | | | | | | | | | | | | | | | Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: ↵Andres Morales2015-01-081-19/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d656955 automerge: c9a7694 automerge: 7628fac * commit '7628fac99fb23b71ae418b9833bc7e5d534c1e9a': Wipe FRP partition if OEM unlock enabled
| * | | | | | | | | | | | | | | Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: ↵Andres Morales2015-01-081-19/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d656955 automerge: c9a7694 * commit 'c9a76941ecca457e6a17b06f557c24e18e3bdafa': Wipe FRP partition if OEM unlock enabled
| | * | | | | | | | | | | | | | Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-devAndres Morales2015-01-081-19/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d656955 * commit 'd656955efdd2e148d9390125b899e8fe2b677abd': Wipe FRP partition if OEM unlock enabled
| | | * | | | | | | | | | | | | Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-devAndres Morales2015-01-081-19/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Wipe FRP partition if OEM unlock enabledAndres Morales2015-01-071-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all devices invoke recovery on every userdata wipe, so we can't rely on code in the recovery OS to do this. This results in fastboot -w not properly wiping the FRP partition. This patch fixes the issue by having the framework level service check the OEM unlock enabled bit, and wiping the partition if it is set. Bug: 18644051 Change-Id: Id97a29916fe39561700912a920c5741109842bdb
* | | | | | | | | | | | | | | | | Un-break the WebView build.Marcin Kosiba2015-01-082-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This renames methods that have been renamed in Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original names. Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
* | | | | | | | | | | | | | | | | resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aospVladimir Marko2015-01-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 371d77e * commit '371d77ecf684163b3bd1061e00191980f1fc90a1': Check for OOM in BitmapFactory's getMimeTypeString().
| * | | | | | | | | | | | | | | | resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aospVladimir Marko2015-01-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
| | * | | | | | | | | | | | | | | am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." ↵Vladimir Marko2015-01-081-4/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8': Check for OOM in BitmapFactory's getMimeTypeString().
| | | * | | | | | | | | | | | | | Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-devVladimir Marko2015-01-081-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18909596 (cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368) Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
* | | | | | | | | | | | | | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from ↵Bryce Lee2015-01-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyManager."" into lmp-mr1-dev automerge: c010c96 automerge: d1646dc automerge: 1cad889 * commit '1cad8899be13e5eaefbc8300a832a826870ea7ca': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
| * | | | | | | | | | | | | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from ↵Bryce Lee2015-01-081-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyManager."" into lmp-mr1-dev automerge: c010c96 automerge: d1646dc * commit 'd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
| | * | | | | | | | | | | | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from ↵Bryce Lee2015-01-081-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyManager."" into lmp-mr1-dev automerge: c010c96 * commit 'c010c96fdf143b242c9795a71b231ccb4658b625': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
| | | * | | | | | | | | | | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from ↵Bryce Lee2015-01-081-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyManager."" into lmp-mr1-dev
| | | | * | | | | | | | | | | | | | | Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."Bryce Lee2015-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8. Causes NPE on devices without telephony (Android Wear for example) Bug:18922524 Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
* | | | | | | | | | | | | | | | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before ↵Jinsuk Kim2015-01-083-13/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 automerge: 764a1ba * commit '764a1ba86d3160e4b1e10aa1ac7477539321b42b': CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
| * | | | | | | | | | | | | | | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before ↵Jinsuk Kim2015-01-083-13/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 * commit '62a1e753b1f73f575c978a377efdc531e7a86b8f': CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
| | * | | | | | | | | | | | | | | | | Merge "CEC: Handle <Active Source> arriving before ↵Jinsuk Kim2015-01-083-13/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 * commit '09d4e03736caa1baf07256fc5cd6d61b264021a7': CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
| | | * | | | | | | | | | | | | | | | Merge "CEC: Handle <Active Source> arriving before ↵Jinsuk Kim2015-01-083-13/+66
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputCallback.onAddInput" into lmp-mr1-dev
| | | | * | | | | | | | | | | | | | | | CEC: Handle <Active Source> arriving before TvInputCallback.onAddInputJinsuk Kim2015-01-083-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves a timing-related bug that fails to process the command <Active Source> at TV boot up. Checks if TV input required for the command is ready to accept the request. If not, makes sure the command is buffered, and processed later when the input is ready. Bug: 18896770 Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
* | | | | | | | | | | | | | | | | | | | am 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" ↵Deepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 03c822a * commit '321bf43315ace2f091a54d514dd56902990bec7a': Replace java.util.LinkedHashMap.eldest()
| * | | | | | | | | | | | | | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 03c822a * commit '03c822aa585c319fb9cd05f392d8518501cc4f79': Replace java.util.LinkedHashMap.eldest()
| | * | | | | | | | | | | | | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d14feb4c7185008111f3a6340f114a4c891e01c': Replace java.util.LinkedHashMap.eldest()
| | | * | | | | | | | | | | | | | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an alternate implementation for the above method and replace the calls to it, since the method is not available on host VM. Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
* | | | | | | | | | | | | | | | | | | | | am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into ↵Deepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 33b2de7 * commit 'f0da92bfda9a7b393cac87436173c1284c7d48be': Add missing DateFormat method.
| * | | | | | | | | | | | | | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 33b2de7 * commit '33b2de7f34180983fe596ff9faa6955b032fa157': Add missing DateFormat method.
| | * | | | | | | | | | | | | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '169c11dd39ec44364168785a7a83fb747e893c9a': Add missing DateFormat method.
| | | * | | | | | | | | | | | | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
generated by cgit v1.1 at 2025-02-15 18:21:21 +0000