119845 Commits

Author SHA1 Message Date
Adam Lesinski
6c6cd5012b Remove reflection instantiation of Accessibility
Accessibility is mandatory so reflection is not required.

Change-Id: Ie5c7b0bba26809425fe0f66efcc09c333138b21f
2014-03-17 12:54:03 -07:00
Ben Murdoch
889a1ddd00 Fix JavaDoc
Change-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371
2014-03-17 19:20:43 +00:00
Torne (Richard Coles)
01252217a5 Merge "Fix javadoc." into klp-modular-dev 2014-03-17 17:58:30 +00:00
Geoff Mendal
028992915f am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
* commit 'c3281db2fb874f56d5612b9d3f07bd91067755ac':
  Import translations. DO NOT MERGE
2014-03-17 17:54:58 +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
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
Geoff Mendal
6532523652 Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
2014-03-17 09:34:19 -07: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
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
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
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
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
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
Selim Cinek
9c3fc0cc60 am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height
2014-03-14 20:47:34 +00:00
Tim Kilbourn
0722968c59 FEATURE_LEANBACK implies that the device is a tv.
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
2014-03-14 13:44:12 -07:00
Tim Kilbourn
557403250b Merge "Add leanback device features." into klp-modular-dev 2014-03-14 20:38:51 +00:00
Selim Cinek
eb95e74e21 DO NOT MERGE - Fixed crash for odd image width/height
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
2014-03-14 20:11:17 +00:00
Ricardo Cervera
882ba89bf4 am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs
* commit '506949173761f9bde016b9d74de94df4b63df370':
  docs: Updated Building your First App tutorial. Bug: 13429905
2014-03-14 16:28:46 +00:00
Joe Fernandez
58f019a646 am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '8bb11153f946a95485644b08a067472735810ef2':
  Doc change: Update developer video on home page carousel.
2014-03-14 16:28:30 +00:00
John Spurlock
28ac0c10ae am ad66c27b: am 6d9b034c: Fix typo in public logcat page.
* commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
  Fix typo in public logcat page.
2014-03-14 16:28:26 +00:00
Ricardo Cervera
784aab786c am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '8714a3437e13b4a403e49c4c624f272dd6dc8f4e':
  docs: Added step to get JDK to the Android Studio install instructions.
2014-03-14 16:28:22 +00:00
Katie McCormick
8e142bbbe1 am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit 'b681794d2583e06693c23eec1af4e282b067abd9':
  Doc update: new doc studio layout editor
2014-03-14 16:28:18 +00:00
John Spurlock
75985bbe2f am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '62826f55be4415684b4e321469298ba43d598bbb':
  Fix doc typos in AppOpsManager.java
2014-03-14 16:28:15 +00:00
JP Abgrall
4f26139661 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:28:09 +00:00
Chad Brubaker
7c2b1625d6 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:27:58 +00:00
Svetoslav
358eaa7825 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
2014-03-14 16:27:55 +00:00
Adrian Roos
70a0ea0e8d am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-14 16:27:51 +00:00
Baligh Uddin
46bfaa1b93 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
  Import translations. DO NOT MERGE
2014-03-14 16:27:44 +00:00
Dianne Hackborn
d4981014d4 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit 'e5191aabff5b9b751349b8634836a858af744905':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:27:40 +00:00
Jeff Brown
6adc96020f am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '825dd9dd38a42306d18a627768b16204cf4d8710':
  Retain display when creating specialized contexts. (DO NOT MERGE)
2014-03-14 16:27:35 +00:00
Zhihai Xu
57080be98e am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
2014-03-14 15:56:47 +00:00
Craig Mautner
00c7d34c46 am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit 'ff89d589c7eb32265bf70068ffaef24104a580a5':
  Show the keyguard if unsecure window on top
2014-03-14 08:47:54 +00:00
Craig Mautner
ff89d589c7 Merge commit '3b9de0a4' into manualmerge
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
2014-03-13 21:09:35 -07:00
Jeff Brown
6ae4d53b57 resolved conflicts for merge of db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
2014-03-13 21:07:33 -07:00
Yohei Yukawa
fd2f8d4341 am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '51b921d0e33302b3f431dcfa15bd6588408525ea':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 03:03:08 +00:00
Yohei Yukawa
51b921d0e3 DO NOT MERGE - Preserve the order of InputMethodManager method calls
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520

This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.

InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.

See the following demo code:

  Final InputMethodManager imm = ...;
  imm.setAdditionalInputMethodSubtypes(id, subTypes);
  Final List<InputMethodInfo> ims = imm.getInputMethodList();

Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.

With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.

BUG: 13033954
BUG: 13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
2014-03-14 11:52:09 +09:00
Craig Mautner
3b9de0a429 am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev
* commit '00e12e61472d850c00cf1e479fda2b371ead1257':
  Show the keyguard if unsecure window on top
2014-03-13 19:47:29 -07:00
Craig Mautner
00e12e6147 am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev
* commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c':
  Show the keyguard if unsecure window on top
2014-03-13 19:40:49 -07:00