summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | am 647e0df0: Merge "Surface: Leave object in unlocked state when ↵Jesse Hall2014-10-131-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlockCanvasAndPost fails" into lmp-dev * commit '647e0df0c711cd53763367c86b15f10470eaeb6f': Surface: Leave object in unlocked state when unlockCanvasAndPost fails
| * | | | | | | | | | | | | | Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost ↵Jesse Hall2014-10-131-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fails" into lmp-dev
| | * | | | | | | | | | | | | Surface: Leave object in unlocked state when unlockCanvasAndPost failsJesse Hall2014-10-131-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If nativeUnlockCanvasAndPost() throws, Surface was maintaining a reference to the native Surface, and assuming it was still locked. That would cause future lockCanvas() calls to throw without even trying to lock the native Surface, even though in some cases the native lock was actually released before the exception was thrown. Now Surface treats the native object as unlocked even if nativeUnlockCanvasAndPost() throws, so it will attempt the native lock on lockCanvas() rather than assuming it would fail. This change also changes an IllegalStateException to IllegalArgumentException in unlockCanvasAndPost(). That exception was added in KitKat, and was never documented or added to the throws declaration. This was essentially a silent public API change. Quite a bit of code in the framework (and likely in applications) catches IAE from this method, but didn't attempt to handle ISE. Although ISE is more correct here, it's not worth breaking code (and it did -- in this bug it changed a problem that should have been silently and perfectly recovered from into a fatal exception in system_server.) Bug: 17684556 Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
* | | | | | | | | | | | | | | am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from ↵Amit Mahajan2014-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dangerous to signatureOrSystem." into lmp-dev * commit '1901e175079e3b7242ace7d4b3ec38af3723f91b': Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
| * | | | | | | | | | | | | Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to ↵Amit Mahajan2014-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signatureOrSystem." into lmp-dev
| | * | | | | | | | | | | | | Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous toAmit Mahajan2014-10-131-1/+1
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signatureOrSystem. Bug: 17952946 Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
* | | | | | | | | | | | | | am 2dfd8d57: Merge "Update config when "Show input method" is changed" into ↵Yohei Yukawa2014-10-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60': Update config when "Show input method" is changed
| * | | | | | | | | | | | | Merge "Update config when "Show input method" is changed" into lmp-devYohei Yukawa2014-10-131-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Update config when "Show input method" is changedYohei Yukawa2014-10-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for I2237ded850a0d4ab43ca441d0b7df1. Seems that we still need to update config settings every time when "Show input method" is changed. BUG: 17666032 Change-Id: I480aeaa038bef9c3c20e8f0b36110e92a35809db
* | | | | | | | | | | | | | am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or ↵Mike Lockwood2014-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system" into lmp-dev * commit '317f9ce85a492a213b8f1dac477b1aefad55f621': Change RECEIVE_BLUETOOTH_MAP permission to signature or system
| * | | | | | | | | | | | | Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into ↵Mike Lockwood2014-10-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | * | | | | | | | | | | | Change RECEIVE_BLUETOOTH_MAP permission to signature or systemMike Lockwood2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17954105 Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
* | | | | | | | | | | | | | am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-devMichael Wright2014-10-131-12/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b': Clean-up ColorFade's shaders and buffers.
| * | | | | | | | | | | | | Merge "Clean-up ColorFade's shaders and buffers." into lmp-devMichael Wright2014-10-131-12/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Clean-up ColorFade's shaders and buffers.Michael Wright2014-10-091-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17672241 Change-Id: I73328ee4d83c3a8700b7b19b661bcaec7ada877f
* | | | | | | | | | | | | | am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '02c4a225ffa32e67255517a0275d7a4c1a738619': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-134-85/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-134-85/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774 Auto-generated-cl: translation import
* | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-133-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-133-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-137-69/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-137-69/+69
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | am d700e5a3: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | * commit 'd700e5a37afec6c264609c5df4c3a6b783417330': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-138-438/+438
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec Auto-generated-cl: translation import
* | | | | | | | | | | | | am 43751757: Merge "Remove the default WebView text encoding resource ↵Marcin Kosiba2014-10-133-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entirely." into lmp-dev * commit '437517573b53b17765eba9b0b98055915bf3a4a1': Remove the default WebView text encoding resource entirely.
| * | | | | | | | | | | | Merge "Remove the default WebView text encoding resource entirely." into lmp-devMarcin Kosiba2014-10-133-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove the default WebView text encoding resource entirely.Marcin Kosiba2014-10-103-6/+2
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the default text encoding in config.xml makes it seem like it's something that could be changed, but upon further inspection we can't see any good reason for anyone to ever want to change it from UTF-8. BUG: 17634120 Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
* | | | | | | | | | | | | am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the ↵Joe Fernandez2014-10-139-1/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer Samples area" into lmp-dev * commit '7e522af60ffc3de9d809a82808bf93eba9917d32': docs: Move the L-Developer Preview samples page to the Developer Samples area
| * | | | | | | | | | | | Merge "docs: Move the L-Developer Preview samples page to the Developer ↵Joe Fernandez2014-10-139-1/+243
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Samples area" into lmp-dev
| | * | | | | | | | | | | | docs: Move the L-Developer Preview samples page to the Developer Samples areaJoe Fernandez2014-10-129-1/+243
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612
* | | | | | | | | | | | | am cd2445a9: docs: Migrate TV Design docs to main DAC-Design areaJoe Fernandez2014-10-1316-102/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd2445a9aa1159dead4107a770b898c8305aed19': docs: Migrate TV Design docs to main DAC-Design area
| * | | | | | | | | | | | docs: Migrate TV Design docs to main DAC-Design areaJoe Fernandez2014-10-1216-102/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57
* | | | | | | | | | | | | am 15edcda5: docs: migrate Android TV games page to TV training sectionJoe Fernandez2014-10-133-186/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15edcda56ba12ad04a286f4d07f2b6fe0b1c5e38': docs: migrate Android TV games page to TV training section
| * | | | | | | | | | | | docs: migrate Android TV games page to TV training sectionJoe Fernandez2014-10-123-186/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118
* | | | | | | | | | | | | am e6b9abb3: docs: migrate Android TV content discoveryJoe Fernandez2014-10-135-143/+276
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6b9abb3ad06d32e76a07e733e0a6554479fbfa4': docs: migrate Android TV content discovery
| * | | | | | | | | | | | docs: migrate Android TV content discoveryJoe Fernandez2014-10-125-143/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20
* | | | | | | | | | | | | am f666355b: docs: migrate TV Playback app contentJoe Fernandez2014-10-134-98/+230
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f666355b2d9dbffffa640aff7731a8ba8309eaaa': docs: migrate TV Playback app content
| * | | | | | | | | | | | docs: migrate TV Playback app contentJoe Fernandez2014-10-124-98/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
* | | | | | | | | | | | | am d86a2f5b: docs: Android TV App Dev Basic TrainingJoe Fernandez2014-10-1314-1540/+1165
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd86a2f5b344a6c3520ab05c02df8a5b3fdfa5aea': docs: Android TV App Dev Basic Training
| * | | | | | | | | | | | docs: Android TV App Dev Basic TrainingJoe Fernandez2014-10-1214-1540/+1165
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e
* | | | | | | | | | | | Revert "Add color to PhoneAccount objects (1/3)"Ihab Awad2014-10-111-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.
* | | | | | | | | | | | am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." ↵Dianne Hackborn2014-10-113-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'bbbeafa9bf0c4598b32c615c72e2c87ef62c85e9': Fix issue #17829949: Don't kill Bluetooth service...
| * | | | | | | | | | | Merge "Fix issue #17829949: Don't kill Bluetooth service..." into lmp-devDianne Hackborn2014-10-113-7/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix issue #17829949: Don't kill Bluetooth service...Dianne Hackborn2014-10-103-7/+19
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...even in extreme low memory condition Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to go to a higher oom adj level. Fix some problems when this is done from a system or persistent process, where this would go to a level that is *too* high. Instead, introduce a new oom adj level for it that is right below persistent. Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
* | | | | | | | | | | | am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of ↵Amit Mahajan2014-10-111-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0." into lmp-dev * commit 'c6c18618e999f24675e23b67e6c488d700199579': Fix to show low LTE signal strength as -140 instead of 0.
| * | | | | | | | | | | Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-devAmit Mahajan2014-10-111-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix to show low LTE signal strength as -140 instead of 0.Amit Mahajan2014-10-101-3/+2
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17942583 Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
* | | | | | | | | | | | am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" ↵Alan Viverette2014-10-112-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '99cc35bbde7415fcdeada6fb4243097af85ae33f': Add Cutive Mono as serif monospace font for captioning
| * | | | | | | | | | | Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-devAlan Viverette2014-10-102-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add Cutive Mono as serif monospace font for captioningAlan Viverette2014-10-102-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets up Courier and Courier New to point to Cutive Mono, since Courier is a serif monospace font. BUG: 17666124 Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
generated by cgit v1.1 at 2025-02-19 09:51:10 +0000