116216 Commits

Author SHA1 Message Date
Dave Platt
17e7c4076b am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes
2014-03-19 00:54:54 +00:00
Dave Platt
98a027a506 Merge "Harden NsdManager against null-dereference crashes" into klp-dev 2014-03-19 00:50:30 +00:00
Jeff Brown
c9a7eeba15 am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.
2014-03-19 00:25:41 +00:00
Jeff Brown
4cb1bc2877 Merge "Refresh cast icon assets to improve visual contrast." into klp-dev 2014-03-19 00:19:38 +00:00
Xia Wang
1b007565c7 am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.
2014-03-18 22:16:26 +00:00
Xia Wang
9b65070211 Merge "Fix state transition verification." into klp-dev 2014-03-18 22:10:32 +00:00
Jeff Brown
f1e8d36327 Refresh cast icon assets to improve visual contrast.
Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
2014-03-18 14:40:43 -07:00
Adrian Roos
a4a1c0d4ee am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: 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 'ac275cb3d8184e83228899280bb8901e30f3a5f2':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:07:28 +00:00
Adrian Roos
ac275cb3d8 am 1f3186ee: (-s ours) am 67a92975: 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 '1f3186ee4505997ef3a235f669313236099308f4':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 21:03:15 +00:00
Adrian Roos
1f3186ee45 am 67a92975: 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 '67a92975ac638db3d51ea4978cf78ee207fcceb7':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-18 13:59:28 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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