119928 Commits

Author SHA1 Message Date
Adrian Roos
67a92975ac am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '88da2bfaacaafebdd2e0fb9542386486b9594871':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:53:17 -07:00
Adrian Roos
88da2bfaac am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:47:58 -07:00
Adrian Roos
ed529a5a78 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:41:20 -07:00
Adrian Roos
500ec9ce4b am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:34:05 -07:00
Adrian Roos
25fb713390 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:28:17 -07:00
Adrian Roos
0b2f212204 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:24:35 -07:00
Adrian Roos
d3da8f711e am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:17:12 -07:00
Doug Zongker
cdf0088839 add option to shutdown after factory reset
Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system.  Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.

Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef
2014-03-18 12:52:04 -07:00
Xia Wang
01f03b50fb Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
2014-03-18 18:23:05 +00:00
Jeff Sharkey
42c32c0c88 Lock down MANAGE_DOCUMENTS permission.
MANAGE_DOCUMENTS is a very broad permission, since it allows full
access to all DocumentsProviders.  DocumentsUI should really be the
only app holding this permission; everyone else should rely on Uri
permission grants for access.

Bug: 12958298
Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8
2014-03-18 11:05:43 -07:00
Wink Saville
c8e8e3eba6 Handle provisioning APN by turning off/on data.
This is a start and two tests succeed:

Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.

I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...

The current bug is below, but it is poorly named either it should be
renamed or a new bug created.

Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
2014-03-18 10:58:40 -07:00
Adrian Roos
ecba937b00 DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

Bug: 13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
2014-03-18 18:33:14 +01:00
Ricardo Cervera
808779d189 am 965e5e85: am ace69017: docs: Reverted ADT 22.6.1 links
* commit '965e5e8520d040ce7e064db665982eb98c626b2b':
  docs: Reverted ADT 22.6.1 links
2014-03-18 17:17:30 +00:00
Ricardo Cervera
965e5e8520 am ace69017: docs: Reverted ADT 22.6.1 links
* commit 'ace69017443eac3101bf5e36f863fd3cf80cce9f':
  docs: Reverted ADT 22.6.1 links
2014-03-18 17:11:58 +00:00
Ricardo Cervera
ace6901744 docs: Reverted ADT 22.6.1 links
Change-Id: Ic08cd7df8d50235e6a673f00dda6baa6863c9025
2014-03-18 10:02:06 -07:00
Victoria Lease
1c12f9e762 malloc some advances
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
2014-03-18 16:22:20 +00:00
Scott Main
89f0e76813 am f60dd6e2: am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
* commit 'f60dd6e2d2765b01018da69dc9ee776e50b47431':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
2014-03-18 12:54:45 +00:00
Scott Main
f60dd6e2d2 am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
* commit '50d7dc99e507082c81476ea1474de9970589dee5':
  add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch.
2014-03-18 12:51:40 +00:00
Scott Main
50d7dc99e5 add ALL of the Android Wear Dev Preview docs to DAC
these were built from the klp-cw-preview-release branch.

Change-Id: I9beef683528cfe57b4d088fe7adeb1638b89a640
2014-03-18 05:41:12 -07:00
Scott Main
e77c260b3a am 60409d80: am 81857ec5: add android wear to the home carousel
* commit '60409d802e5df6f85f1f91036327a146b48601c1':
  add android wear to the home carousel
2014-03-18 12:09:53 +00:00
Scott Main
60409d802e am 81857ec5: add android wear to the home carousel
* commit '81857ec572b133f99cdbcd575774eb5f9be073b0':
  add android wear to the home carousel
2014-03-18 12:05:40 +00:00
Scott Main
81857ec572 add android wear to the home carousel
Change-Id: I1dc50100dd50a710a23b08f677121d499c166b3f
2014-03-18 03:04:40 -07:00
Mark Renouf
297990806d Make InternalListener static to avoid referencing SpeechRecognizer.
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
(cherry picked from commit b37866db469e81aca534ff6186bdafd44352329b)
2014-03-18 01:58:39 +00:00
Ricardo Cervera
97a05b39fc am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
* commit 'f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
  docs: Added release notes for SDK 22.6.1
2014-03-17 22:14:25 +00:00
Ricardo Cervera
f7c3ecc1e1 am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
* commit '71a47aa7f0ea18bc4d10d87a1932c9f19554fb15':
  docs: Added release notes for SDK 22.6.1
2014-03-17 22:11:12 +00:00
Ricardo Cervera
71a47aa7f0 Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 2014-03-17 22:07:18 +00:00
Ricardo Cervera
e2a40c42be docs: Added release notes for SDK 22.6.1
Added release notes for SDK 22.6.1.

stage: http://quixote.mtv:8001/tools/sdk/eclipse-adt.html

Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Added new release notes info from Raphael.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.

Change-Id: I229c6b366c19d1d119ccd180ead04f7dd044de4e
2014-03-17 14:42:20 -07:00
Michael Wright
39ca052292 Add idc config option for handling key repeats
Bug: 13285870
Change-Id: Iea2a5d03e29c86dcee5f99a25e48736ebc6dd913
2014-03-17 14:13:25 -07:00
Dan Sandler
4d460833b9 DO NOT MERGE: Maintain binding to crashed listeners.
Adapted from change I44ce250e, "Maintain binding to crashed
listeners from NotificationManagerService.":

> This fixes the logic on the death handlers for notification
> listeners, and doesn't unbind from the listener services so
> that the system will bring them back up again.

Bug: 12587702
Change-Id: I41d0c6733046ee9760bcfae4407e754592b805ea
2014-03-17 20:10:50 +00:00
Adam Lesinski
006209c2fc Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev 2014-03-17 19:56:10 +00:00
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
Marco Nelissen
c936d73adb Verify certificates
b/13418320

Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/

Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
2014-03-17 11:14:18 -07: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
Chad Brubaker
4c5c33e5e6 Fix support for simultaneous VPN tuns
A VPN can once again bring up a new tun interface while the old tun is
running. Once the new tun is set up the routing rules will be removed from the
old tun. It is up to the application to drain the old tun of traffic and
close it.

If the new tun fails to come up the old tun will remain untouched and
can still be used.

To prevent leakage the new rules are added before the old tun is
shutdown. Netd/Dns has been changed to allow multiple rules to exist
at once with the most recently added rule taking priority.

Bug: 12134439
Change-Id: I7e00c7c68cc339d81f09b3d2a33276ffc76985f5
2014-03-15 15:32:39 -07:00
Chad Brubaker
1b66923148 Include the interface for clearDnsInterfaceForUidRange
With netd allowing overlapping rules for uid range rules the interface
name is needed to make sure only the correct rule is removed.

Bug: 12134439
Change-Id: I94f77f154f49ca8d5f6cf49683a4473cc92c3eb7
2014-03-15 15:31:47 -07: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