127998 Commits

Author SHA1 Message Date
Jeff Sharkey
ac0f9ffda2 am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit 'da07fe64b09bbf75cf831067dfe678ed06950f8e':
  Null pointer exception in FileRotator.java
2014-03-17 17:52:56 +00:00
Torne (Richard Coles)
5aa9c5a77b Fix javadoc.
Fix javadoc reference missing a #

Bug: 13246311
Change-Id: Ifc06234943339250feb5b4f2077af03c35be076e
2014-03-17 17:51:40 +00:00
John Reck
f666ad7046 Rename DisplayList->RenderNode
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
2014-03-17 10:30:32 -07:00
Jessica Hummel
5139f9c896 am 02b872be: Merge "Temporarily allow system apps to fully act across users."
* commit '02b872bee14804e3f0e650986ce0f2c2914adbf4':
  Temporarily allow system apps to fully act across users.
2014-03-17 10:21:13 -07:00
Geoff Mendal
19a1dcf04f Import translations. DO NOT MERGE
Change-Id: Ic610f196330c190df9bf2dfcceb0dd2437250b7d
Auto-generated-cl: translation import
2014-03-17 10:18:49 -07:00
Jessica Hummel
02b872bee1 Merge "Temporarily allow system apps to fully act across users." 2014-03-17 17:17:36 +00:00
Geoff Mendal
ae11572417 am 47e6d5d2: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '47e6d5d2748087f9fa861e6e2d3a2270748f72e5':
  Import translations. DO NOT MERGE
2014-03-17 10:13:35 -07:00
Geoff Mendal
a97cd79fea Import translations. DO NOT MERGE
Change-Id: Ic78ab9269a3e4b81d94756bcba14123c05969387
Auto-generated-cl: translation import
2014-03-17 10:12:09 -07:00
Geoff Mendal
47e6d5d274 Merge "Import translations. DO NOT MERGE" 2014-03-17 17:10:24 +00:00
ztenghui
50ecf849cb Create one hole inside the umbra area to avoid overdraw.
bug:13439450

Change-Id: I859575196bd5a3029f447883025a6ec3a1f1face
2014-03-17 10:10:02 -07:00
Geoff Mendal
56bdacccb9 Import translations. DO NOT MERGE
Change-Id: I0099deb9f73a8d3c6ea1ff8a8aa8808d7f1c322e
Auto-generated-cl: translation import
2014-03-17 10:08:44 -07:00
Jessica Hummel
b4ca2639e4 Temporarily allow system apps to fully act across users.
This is to allow launcher to start activities across users
and will be reverted when an alternative API is provided.

Change-Id: I67ec3e9d419afffbadce37d6e9958e2dfc096fb2
2014-03-17 17:08:22 +00:00
Jessica Hummel
03dd22079c Standardize the provisioning intent action.
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
2014-03-17 16:53:27 +00:00
Geoff Mendal
c3281db2fb am 65325236: (-s ours) Import translations. DO NOT MERGE
* commit '6532523652cf16d3e498939965defab4bd22c491':
  Import translations. DO NOT MERGE
2014-03-17 16:46:53 +00:00
Jeff Sharkey
da07fe64b0 am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
  Null pointer exception in FileRotator.java
2014-03-17 16:39:13 +00:00
Geoff Mendal
c4fb04db4d am febddd20: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'febddd200ec05d7d66325835cc4c3ffa76d4f83d':
  Import translations. DO NOT MERGE
2014-03-17 09:36:43 -07:00
Geoff Mendal
3c41b633da am 79dc65d0: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '79dc65d08ea5c7729b2dc63e57e8123e7cc9c2c3':
  Import translations. DO NOT MERGE
2014-03-17 09:36:40 -07:00
Jeff Sharkey
eeb36c5cfc am d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit 'd88d817498327462f42e50348239eac59147f310':
  Null pointer exception in FileRotator.java
2014-03-17 09:36:03 -07:00
Geoff Mendal
febddd200e Merge "Import translations. DO NOT MERGE" 2014-03-17 16:34:26 +00:00
Geoff Mendal
6532523652 Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
2014-03-17 09:34:19 -07:00
Geoff Mendal
79dc65d08e Merge "Import translations. DO NOT MERGE" 2014-03-17 16:34:08 +00:00
Jeff Sharkey
d88d817498 Merge "Null pointer exception in FileRotator.java" 2014-03-17 16:32:05 +00:00
Geoff Mendal
d027b6ac95 Import translations. DO NOT MERGE
Change-Id: Ifbc42b448dd9a92fce471716061797ba608cfd76
Auto-generated-cl: translation import
2014-03-17 09:29:38 -07:00
Geoff Mendal
554428c327 Import translations. DO NOT MERGE
Change-Id: I997192f031eea02fbad2f41370db984dce84b65c
Auto-generated-cl: translation import
2014-03-17 09:27:08 -07:00
Leon Scroggins III
864809a45a am 946bb3ce: am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit '946bb3cef9137cb12e2200cd286713aa1d74fb48':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-17 09:06:21 -07:00
Leon Scroggins III
56bf6fa33a am 48c41b3d: am 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '48c41b3d33968c8ffe0aa3db70ce4e0dd36df1cc':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-17 09:06:18 -07:00
Leon Scroggins III
946bb3cef9 am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit '8cee1fdc2542e5146c9b3d375819e87daeb4d1aa':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-17 16:02:29 +00:00
Leon Scroggins III
48c41b3d33 am 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '7e6fe28b12bf936cc8c5c5f689a6aef6b7f21625':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-17 16:02:26 +00:00
Leon Scroggins III
8cee1fdc25 am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit 'f096ed68e1ee5810f436ca820c1eada4b1a182a5':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-17 15:58:36 +00:00
Leon Scroggins III
7e6fe28b12 am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '96978ee290ea0ef666c49ffa8733a8c74304c9f1':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-17 15:58:32 +00:00
Leon Scroggins III
f096ed68e1 am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit '2fd045c092b08772be81a6d58bbb95e5e608403f':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-17 15:55:46 +00:00
Leon Scroggins III
96978ee290 am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-17 15:55:43 +00:00
Leon Scroggins III
2fd045c092 DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
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
2014-03-17 14:18:53 +00:00
Leon Scroggins III
f8d8777ddd Update framework to use M33 Skia. DO NOT MERGE
(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
2014-03-17 13:57:18 +00:00
Wonsik Kim
475e3f0e88 Revert "VideoPlaneView initial implementation"
This reverts commit 5f8aa4142919b3001fd2621f7acd5f609a5129a5.

Change-Id: I161748f365512c5e24acba2c3d9ebd9405fa8e3f
2014-03-17 11:17:47 +00:00
Ashok Bhat
2bb39d7a43 Pass int32_t for JNI calls to java Input/Output streams.
Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
2014-03-17 10:13:16 +00:00
Winson Chung
b584e67a2c am a1e4bf9b: Merge "Fixing crash when ActivityManager does not have a proper thumbnail"
* commit 'a1e4bf9b6c817f9b1558faabb949bbe516f3a187':
  Fixing crash when ActivityManager does not have a proper thumbnail
2014-03-16 18:56:49 -07:00
Winson Chung
9b9540ffe4 am 0662038b: Merge "Simplifying memory management, use Task Keys as resource cache keys."
* commit '0662038bcbfda260c2dee410da3f4006f4bd5a19':
  Simplifying memory management, use Task Keys as resource cache keys.
2014-03-16 18:56:46 -07:00
Winson Chung
a1e4bf9b6c Merge "Fixing crash when ActivityManager does not have a proper thumbnail" 2014-03-17 01:54:26 +00:00
Winson Chung
0662038bcb Merge "Simplifying memory management, use Task Keys as resource cache keys." 2014-03-17 01:54:04 +00:00
Steve Moyer
54660b4c50 am 9f2b2179: am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '9f2b21792e7b25dbb2d94fd8d07c881a46c467e4':
  Don't attempt to launch disabled activities in smoke test.
2014-03-16 10:40:46 -07:00
Steve Moyer
9f2b21792e am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '9e6bad83608bbe5da07d52c764087496a136ad42':
  Don't attempt to launch disabled activities in smoke test.
2014-03-16 17:37:55 +00:00
Steve Moyer
9e6bad8360 am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
  Don't attempt to launch disabled activities in smoke test.
2014-03-16 17:35:30 +00:00
Steve Moyer
adb3a198be am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '05d855defe8610854592ddd7baf5644ac6d4da15':
  Don't attempt to launch disabled activities in smoke test.
2014-03-16 17:31:18 +00:00
Steve Moyer
05d855defe am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
  Don't attempt to launch disabled activities in smoke test.
2014-03-16 10:29:25 -07:00
Steve Moyer
d93e7b2424 Merge "Don't attempt to launch disabled activities in smoke test." 2014-03-16 17:26:43 +00:00
Jaewan Kim
5afda1a9c1 am f207ec76: Merge "EthernetDataTracker: Update hardware address when interface is changed"
* commit 'f207ec76a51c96a72b7d972636dfa8f9e658fc92':
  EthernetDataTracker: Update hardware address when interface is changed
2014-03-16 03:25:51 -07:00
Jaewan Kim
f207ec76a5 Merge "EthernetDataTracker: Update hardware address when interface is changed" 2014-03-16 10:23:35 +00:00
John Reck
094c09a4f9 am e2d3f28e: Merge "Revert "Rename DisplayList->RenderNode""
* commit 'e2d3f28e85e59f50bbab548d3c449de0b91be3ba':
  Revert "Rename DisplayList->RenderNode"
2014-03-14 19:17:22 -07:00
John Reck
e2d3f28e85 Merge "Revert "Rename DisplayList->RenderNode"" 2014-03-15 02:15:34 +00:00