summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Fixing crash when ActivityManager does not have a proper thumbnailWinson Chung2014-03-145-39/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing issue with hw layers ref count not properly being incremented and decremented - Preventing message handler from keeping a strong ref to the RecentsService
* | | | | | | | | | | | Merge "Simplifying memory management, use Task Keys as resource cache keys."Winson Chung2014-03-1714-325/+243
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Simplifying memory management, use Task Keys as resource cache keys.Winson Chung2014-03-1414-325/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attempts to load non-topmost task thumbnails from cache - Ensuring that we release all references to the activity from the bg loader - Removes background loading debug flag - Moving callbacks into their respective classes - cleaning up some callbacks when data is loaded in the bg Change-Id: Ibb968349d08084922d5b28e432b76a165bf20d6b
* | | | | | | | | | | | am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to ↵Steve Moyer2014-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | launch disabled activities in smoke test." * commit '9e6bad83608bbe5da07d52c764087496a136ad42': Don't attempt to launch disabled activities in smoke test.
| * | | | | | | | | | | am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch ↵Steve Moyer2014-03-162-10/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled activities in smoke test." * commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2': Don't attempt to launch disabled activities in smoke test.
| | * | | | | | | | | | am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled ↵Steve Moyer2014-03-162-10/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activities in smoke test." * commit '05d855defe8610854592ddd7baf5644ac6d4da15': Don't attempt to launch disabled activities in smoke test.
| | | * | | | | | | | | am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."Steve Moyer2014-03-162-10/+12
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed': Don't attempt to launch disabled activities in smoke test.
| | | | * | | | | | | | Merge "Don't attempt to launch disabled activities in smoke test."Steve Moyer2014-03-162-10/+12
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Don't attempt to launch disabled activities in smoke test.Steve Moyer2014-02-202-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the superfluous runner from manifest. Change-Id: I194b260d443d9bd4a16f62893bb2f7bcfb7ed40e
* | | | | | | | | | | | | Merge "EthernetDataTracker: Update hardware address when interface is changed"Jaewan Kim2014-03-161-16/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | EthernetDataTracker: Update hardware address when interface is changedJaewan Kim2014-03-141-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I154f151ca676e1e4137eb8210fd377659cfc7867
* | | | | | | | | | | | | | Merge "Revert "Rename DisplayList->RenderNode""John Reck2014-03-1515-1101/+1076
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Rename DisplayList->RenderNode"John Reck2014-03-1515-1101/+1076
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed some test(s), reverting to fix build This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59. Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
* | | | | | | | | | | | | | | am 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into ↵Craig Mautner2014-03-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manualmerge * commit '821df858fcc63be8cd7e53e6432a6a17d734412d': Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
| * | | | | | | | | | | | | | am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmergeCraig Mautner2014-03-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c': Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
| | * | | | | | | | | | | | | am ca0aba39: Merge commit \'54d5702c\' into manualmergeCraig Mautner2014-03-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca0aba399326886d1a39c2344bab296044ba5eb0': Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
| | | * | | | | | | | | | | | Merge commit '54d5702c' into manualmergeCraig Mautner2014-03-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: services/core/java/com/android/server/am/TaskRecord.java Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
| | | | * | | | | | | | | | | am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT ↵Craig Mautner2014-03-142-21/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE." into klp-dev * commit '477897ad7b0725fa68d32a94bf8c24264068fd5c': Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
| | | | | * | | | | | | | | | Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into ↵Craig Mautner2014-03-142-21/+23
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | | * | | | | | | | | | Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.Craig Mautner2014-03-142-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord member frontOfTask was being set true incorrectly for the top activity. It should only be true for the bottom activity. This fix ensures that frontOfTask is always set correctly for all activities by consoldating it into one method. Fixes bug 12171535. Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
* | | | | | | | | | | | | | | | Merge "Rename DisplayList->RenderNode"John Reck2014-03-1515-1076/+1101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename DisplayList->RenderNodeJohn Reck2014-03-1415-1076/+1101
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
* | | | | | | | | | | | | | | am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that ↵Tim Kilbourn2014-03-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the device is a tv." into klp-modular-dev * commit 'c2b8df82d701eb3508da06f75b2201c3f9796373': FEATURE_LEANBACK implies that the device is a tv.
| * | | | | | | | | | | | | | am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is ↵Tim Kilbourn2014-03-141-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a tv." into klp-modular-dev * commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07': FEATURE_LEANBACK implies that the device is a tv.
| | * | | | | | | | | | | | | am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into ↵Tim Kilbourn2014-03-141-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '9539b4a02f74b447db0e3aa1039229f6b913aa87': FEATURE_LEANBACK implies that the device is a tv.
| | | * | | | | | | | | | | | Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-devTim Kilbourn2014-03-141-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | FEATURE_LEANBACK implies that the device is a tv.Tim Kilbourn2014-03-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For managing the ui mode, consider the device to be a television if it has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features. When leanback is available for non-television devices, we need to reconsider the use of these features for setting the television ui mode. Change-Id: I7b82372ce19067e010be9b42111816bab186f95b
* | | | | | | | | | | | | | | | am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: ↵Marco Nelissen2014-03-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Verify certificates" into klp-dev * commit '77a00cfe4b29f180b6f5ed65eddc96422453e191': Verify certificates
| * | | | | | | | | | | | | | | am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify ↵Marco Nelissen2014-03-142-0/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certificates" into klp-dev * commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1': Verify certificates
| | * | | | | | | | | | | | | | am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '203a6ddb0c098821ff36511e2a98211a90a69954': Verify certificates
| | | * | | | | | | | | | | | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '105c47924f7af9319ec9242b952b4bf074585229': Verify certificates
| | | | * | | | | | | | | | | | am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b': Verify certificates
| | | | | * | | | | | | | | | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Verify certificatesMarco Nelissen2014-03-132-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
* | | | | | | | | | | | | | | | | am f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: ↵Daniel 2 Olofsson2014-03-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-initialize error after attach * commit 'f1b1855acc623f6137f1d51810948a8149b2a9e8': Re-initialize error after attach
| * | | | | | | | | | | | | | | | am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error ↵Daniel 2 Olofsson2014-03-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after attach * commit '18306520d8afc168df78024d139ed189d8ff7cdb': Re-initialize error after attach
| | * | | | | | | | | | | | | | | am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attachDaniel 2 Olofsson2014-03-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39fc43b0f91e8d92fc4251e11384c4ea6544cf35': Re-initialize error after attach
| | | * | | | | | | | | | | | | | am 4111e7e1: am 09421fab: Re-initialize error after attachDaniel 2 Olofsson2014-03-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82': Re-initialize error after attach
| | | | * | | | | | | | | | | | | am 09421fab: Re-initialize error after attachDaniel 2 Olofsson2014-03-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09421fab0784bcfc6660a09d02faea7835c28e31': Re-initialize error after attach
| | | | | * | | | | | | | | | | | Re-initialize error after attachDaniel 2 Olofsson2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If flag for error after attach is not reinitialized, it may cause NullPointerException on subsequent onAttachedWindow if error text was reset to null. Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
* | | | | | | | | | | | | | | | | Merge "hal3: Add availableHotPixelModes, update modes."Ruben Brunk2014-03-155-20/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | hal3: Add availableHotPixelModes, update modes.Ruben Brunk2014-03-145-20/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12957573 Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
* | | | | | | | | | | | | | | | | | am 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: ↵Selim Cinek2014-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Fixed crash for odd image width/height * commit '93d279f562e0fa41be11c25e16df483fd8093b88': DO NOT MERGE - Fixed crash for odd image width/height
| * | | | | | | | | | | | | | | | | am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed ↵Selim Cinek2014-03-141-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash for odd image width/height * commit '1470883e0716af4e3f4014e2ef427aae67286fc8': DO NOT MERGE - Fixed crash for odd image width/height
| | * | | | | | | | | | | | | | | | am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd ↵Selim Cinek2014-03-141-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image width/height * commit '149fd6d84d53c7f509418048b931ff2c45e8deb4': DO NOT MERGE - Fixed crash for odd image width/height
| | | * | | | | | | | | | | | | | | am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/heightSelim Cinek2014-03-141-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817': DO NOT MERGE - Fixed crash for odd image width/height
| | | | * | | | | | | | | | | | | | am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/heightSelim Cinek2014-03-141-0/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3': DO NOT MERGE - Fixed crash for odd image width/height
| | | | | * | | | | | | | | | | | | DO NOT MERGE - Fixed crash for odd image width/heightSelim Cinek2014-03-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to an internal rounding in the renderer, the calculations for the cropping area could be slightly offset, getting out of the image boundaries. I sanitized the rect by ensuring they are inside the image. Bug: 12174629 Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be
* | | | | | | | | | | | | | | | | | Merge commit '17586ce7' into manualmergeCraig Mautner2014-03-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: policy/src/com/android/internal/policy/impl/PhoneWindowManager.java Change-Id: I4dedf1dc80e224c47cbc020836ad408b641c1d76
| * | | | | | | | | | | | | | | | | am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit ↵Craig Mautner2014-03-141-12/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'3b9de0a4\' into manualmerge * commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff': Show the keyguard if unsecure window on top
generated by cgit v1.1 at 2025-03-31 16:07:33 +0000