120934 Commits

Author SHA1 Message Date
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
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
6532523652 Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
2014-03-17 09:34:19 -07:00
Jeff Sharkey
d88d817498 Merge "Null pointer exception in FileRotator.java" 2014-03-17 16:32:05 +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
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
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
Craig Mautner
821df858fc am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge
* commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
2014-03-14 23:57:24 +00:00
Craig Mautner
5b98618f24 am ca0aba39: Merge commit \'54d5702c\' into manualmerge
* commit 'ca0aba399326886d1a39c2344bab296044ba5eb0':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
2014-03-14 23:54:46 +00:00
Craig Mautner
ca0aba3993 Merge commit '54d5702c' into manualmerge
Conflicts:
	services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe
2014-03-14 16:49:50 -07:00
Tim Kilbourn
c2b8df82d7 am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
  FEATURE_LEANBACK implies that the device is a tv.
2014-03-14 23:37:55 +00:00
Marco Nelissen
77a00cfe4b am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
  Verify certificates
2014-03-14 23:37:52 +00:00
Daniel 2 Olofsson
f1b1855acc am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach
* commit '18306520d8afc168df78024d139ed189d8ff7cdb':
  Re-initialize error after attach
2014-03-14 23:37:49 +00:00
Tim Kilbourn
42dd0bb6b5 am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
  FEATURE_LEANBACK implies that the device is a tv.
2014-03-14 23:33:11 +00:00
Marco Nelissen
30260c7e93 am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '203a6ddb0c098821ff36511e2a98211a90a69954':
  Verify certificates
2014-03-14 23:33:02 +00:00
Daniel 2 Olofsson
18306520d8 am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach
* commit '39fc43b0f91e8d92fc4251e11384c4ea6544cf35':
  Re-initialize error after attach
2014-03-14 23:33:00 +00:00
Tim Kilbourn
9539b4a02f Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev 2014-03-14 23:13:45 +00:00
Marco Nelissen
203a6ddb0c am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '105c47924f7af9319ec9242b952b4bf074585229':
  Verify certificates
2014-03-14 22:55:50 +00:00
Daniel 2 Olofsson
39fc43b0f9 am 4111e7e1: am 09421fab: Re-initialize error after attach
* commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82':
  Re-initialize error after attach
2014-03-14 22:55:45 +00:00
Craig Mautner
54d5702cf8 am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
* commit '477897ad7b0725fa68d32a94bf8c24264068fd5c':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
2014-03-14 22:36:15 +00:00
Marco Nelissen
105c47924f am 10a07a04: Merge "Verify certificates" into klp-dev
* commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
  Verify certificates
2014-03-14 22:32:02 +00:00
Craig Mautner
477897ad7b Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 2014-03-14 22:30:04 +00:00
Craig Mautner
fdf28cc4be Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
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
2014-03-14 22:28:07 +00:00
Daniel 2 Olofsson
4111e7e176 am 09421fab: Re-initialize error after attach
* commit '09421fab0784bcfc6660a09d02faea7835c28e31':
  Re-initialize error after attach
2014-03-14 22:27:52 +00:00
Marco Nelissen
10a07a043f Merge "Verify certificates" into klp-dev 2014-03-14 22:27:23 +00:00
Selim Cinek
93d279f562 am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '1470883e0716af4e3f4014e2ef427aae67286fc8':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 22:03:09 +00:00
Craig Mautner
17586ce7a6 am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
  Show the keyguard if unsecure window on top
2014-03-14 22:03:06 +00:00
Yohei Yukawa
43bfed5430 am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit 'c05362b84cd55f6bac20a373b74f66a79577109d':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 22:03:03 +00:00
Craig Mautner
ce805c7ce4 am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit '8a6ab82114058eedc6aeb29902f0f3926a33a0c6':
  Fix activities appearing behind launcher icons
2014-03-14 22:03:00 +00:00
Selim Cinek
1470883e07 am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '149fd6d84d53c7f509418048b931ff2c45e8deb4':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 21:59:42 +00:00
Craig Mautner
5df673d915 am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit 'f6f0946addc5230634ac2a09115097531dc6094b':
  Show the keyguard if unsecure window on top
2014-03-14 21:59:39 +00:00
Yohei Yukawa
c05362b84c am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:59:35 +00:00
Craig Mautner
8a6ab82114 am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit 'c6103803cb24dafd2cb056dbac040a046b7ed12d':
  Fix activities appearing behind launcher icons
2014-03-14 21:59:33 +00:00
Selim Cinek
149fd6d84d am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 21:55:05 +00:00
Craig Mautner
f6f0946add am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
  Show the keyguard if unsecure window on top
2014-03-14 21:54:52 +00:00
Yohei Yukawa
77943308f5 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:54:49 +00:00
Craig Mautner
c6103803cb am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit 'a921d8b6b1a3478f258b9999ed909907216edbae':
  Fix activities appearing behind launcher icons
2014-03-14 21:54:45 +00:00
Mike Lockwood
c5353ce373 am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '685831bf8da4f89366ce16c1852f25efad046261':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:50:44 +00:00
Daniel 2 Olofsson
09421fab07 Re-initialize error after attach
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
2014-03-14 14:49:23 -07:00
Mike Lockwood
685831bf8d am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:47:37 +00:00
Mike Lockwood
f9b90434ef am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit 'ff64f5ed7c2b55878d149d546092e029cba15465':
  UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
2014-03-14 21:42:58 +00:00