summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix functor removalJohn Reck2014-03-181-0/+1
| | | | | | Bug: 12179257 Change-Id: Ib63a351b1b289b08452f17086cb6c8b688e2ba4d
* Merge "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-179-168/+5
|\
| * Remove castsShadow and globalCamera APIsChris Craik2014-03-179-168/+5
| | | | | | | | Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
* | am 9229c596: (-s ours) am ae327cd2: (-s ours) am 02899291: (-s ours) am ↵Geoff Mendal2014-03-170-0/+0
|\ \ | | | | | | | | | | | | | | | | | | c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE * commit '9229c596cb35504c23687295868c59c009a23ad5': Import translations. DO NOT MERGE
| * \ am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2: (-s ours) am ↵Geoff Mendal2014-03-170-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 65325236: (-s ours) Import translations. DO NOT MERGE * commit 'ae327cd206bb648a8e88e8f49f678a3ba4627a4e': Import translations. DO NOT MERGE
| | * \ am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import ↵Geoff Mendal2014-03-170-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '028992915f75c858f177d0f61ea469bc47ea50b4': Import translations. DO NOT MERGE
| | | * \ am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3281db2fb874f56d5612b9d3f07bd91067755ac': Import translations. DO NOT MERGE
| | | | * \ am 65325236: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6532523652cf16d3e498939965defab4bd22c491': Import translations. DO NOT MERGE
| | | | | * | Import translations. DO NOT MERGEGeoff Mendal2014-03-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd Auto-generated-cl: translation import
* | | | | | | Merge "Start enforcing explicit intents for Context.bindService()"Dianne Hackborn2014-03-174-10/+22
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Start enforcing explicit intents for Context.bindService()Dianne Hackborn2014-03-174-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer prints a warning, now throws an exception. Also fix a bug in UserManagerService that was causing an exception while booting. Change-Id: I3b43cfe08067da840b6850b9bed58664d36d34f1
* | | | | | | Merge "Revert "Remove castsShadow and globalCamera APIs""Chris Craik2014-03-178-5/+152
|\ \ \ \ \ \ \
| * | | | | | | Revert "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-178-5/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0334c314a5721f49b4d172a9cefe10f157cb28a4. Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
* | | | | | | | Merge "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-178-152/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Remove castsShadow and globalCamera APIsChris Craik2014-03-178-152/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
* | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-11/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ic661d515a94fd5fad39f2d07f0cdf25337fae67c
* | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I2a7cea5806869bcd6aeaeee7dee97d80f819c9aa
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-1732-64/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-1732-64/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic610f196330c190df9bf2dfcceb0dd2437250b7d Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-171-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic78ab9269a3e4b81d94756bcba14123c05969387 Auto-generated-cl: translation import
* | | | | | | | | Merge "Rename DisplayList->RenderNode"John Reck2014-03-1716-1078/+1103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename DisplayList->RenderNodeJohn Reck2014-03-1716-1078/+1103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
* | | | | | | | | | Merge "Standardize the provisioning intent action."Jessica Hummel2014-03-172-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Standardize the provisioning intent action.Jessica Hummel2014-03-172-2/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
* | | | | | | | | | am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer ↵Jeff Sharkey2014-03-172-1/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception in FileRotator.java" * commit 'ac0f9ffda2a7e48d2d641654dafd11b8da39830a': Null pointer exception in FileRotator.java
| * | | | | | | | | am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in ↵Jeff Sharkey2014-03-172-1/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileRotator.java" * commit 'da07fe64b09bbf75cf831067dfe678ed06950f8e': Null pointer exception in FileRotator.java
| | * | | | | | | | am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-172-1/+19
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28': Null pointer exception in FileRotator.java
| | | * \ \ \ \ \ \ \ am d88d8174: Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-172-1/+19
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd88d817498327462f42e50348239eac59147f310': Null pointer exception in FileRotator.java
| | | | * \ \ \ \ \ \ \ Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-172-1/+19
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Null pointer exception in FileRotator.javaMikael Gullstrand2014-03-132-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes a null pointer exception is thrown when examining files managed by the file rotator. The logs from the test show that the Wifi state is changed a large number of times. On every state change, a write operation is initiated on the file system. This will eventually result in out of memory and the call to mBasePath.list() in the maybeRotate(...) method in FileRotator.java will return null so the iteration will throw a NullPointerException. Change-Id: I5d5980d9593bc9ec75281169ca27ee591809903f
* | | | | | | | | | | | | Merge "Temporarily allow system apps to fully act across users."Jessica Hummel2014-03-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Temporarily allow system apps to fully act across users.Jessica Hummel2014-03-171-1/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow launcher to start activities across users and will be reverted when an alternative API is provided. Change-Id: I67ec3e9d419afffbadce37d6e9958e2dfc096fb2
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-1734-133/+69
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-1734-133/+69
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0099deb9f73a8d3c6ea1ff8a8aa8808d7f1c322e Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-171-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbc42b448dd9a92fce471716061797ba608cfd76 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-171-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I997192f031eea02fbad2f41370db984dce84b65c Auto-generated-cl: translation import
* | | | | | | | | | | | am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge ↵Leon Scroggins III2014-03-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516 * commit '8cee1fdc2542e5146c9b3d375819e87daeb4d1aa': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
| * | | | | | | | | | | am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor ↵Leon Scroggins III2014-03-171-22/+47
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes into KLP-MR2 BUG:13191516 * commit 'f096ed68e1ee5810f436ca820c1eada4b1a182a5': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
| | * | | | | | | | | | am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into ↵Leon Scroggins III2014-03-171-22/+47
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KLP-MR2 BUG:13191516 * commit '2fd045c092b08772be81a6d58bbb95e5e608403f': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
| | | * | | | | | | | | DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2Leon Scroggins III2014-03-171-22/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:13191516 Original CLs below: In nativeDecodeFileDescriptor, use fdopen. Instead of attempting to mmap the entire file, create an SkFILEStream from a FILE. BUG:11669944 BUG:11028218 Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41 ------------------------------------------------------------------------- Decode file descriptor from the correct offset. Fix a few bugs in nativeDecodeFileDescriptor: 1. Restore the FD's offset when exiting the function. 2. Copy the data when potentially using an SkImageRef. The old behavior would have continued to modify the file descriptor's offset each time a new decode was required. The copy ensures that the file descriptor remains unchanged. 3. Buffer the file stream. Prior to this change, if the image was not a PNG, the stream would be rewound to the beginning of the file, even if the file descriptor was passed in with an offset. Thanks to the buffer, the stream is only rewound to the original offset. Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1 in external/skia BUG:12807677 BUG:12895876 Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
* | | | | | | | | | | | am 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 ↵Leon Scroggins III2014-03-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skia. DO NOT MERGE * commit '7e6fe28b12bf936cc8c5c5f689a6aef6b7f21625': Update framework to use M33 Skia. DO NOT MERGE
| * | | | | | | | | | am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-1725-212/+270
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96978ee290ea0ef666c49ffa8733a8c74304c9f1': Update framework to use M33 Skia. DO NOT MERGE
| | * | | | | | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-1725-212/+270
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6': Update framework to use M33 Skia. DO NOT MERGE
| | | * | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-1725-212/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33 Conflicts: core/jni/android/graphics/Bitmap.cpp core/jni/android/graphics/Graphics.cpp core/jni/android/graphics/Typeface.cpp graphics/java/android/graphics/Bitmap.java
* | | | | | | | | | | Merge "Fixing crash when ActivityManager does not have a proper thumbnail"Winson Chung2014-03-175-39/+78
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-29 00:43:24 +0000