OSDN Git Service
Christopher Tate [Wed, 18 Feb 2015 01:04:01 +0000 (17:04 -0800)]
Fix wifi AP backup
An OutputStream buffers only by explicit contract. OutputStreamWriter
buffers internally, always. Do not get these behaviors confused.
Bug
19341967
Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]
Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug:
19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]
Fix year picker initial range
BUG:
19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
Craig Mautner [Tue, 17 Feb 2015 18:17:21 +0000 (10:17 -0800)]
Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug
19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
Adrian Roos [Tue, 17 Feb 2015 19:46:01 +0000 (20:46 +0100)]
Revert "Fixed accessibility for the pin input view on keyguard."
Also removes the Klondike from the content description.
This reverts commit
c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584
Bug:
18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
The Android Automerger [Fri, 13 Feb 2015 09:10:38 +0000 (01:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge:
fe2c687
* commit '
fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge:
e0306bb
* commit '
e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Ruben Brunk [Thu, 12 Feb 2015 20:16:44 +0000 (12:16 -0800)]
camera2: Fix legacy scaling factor application.
Bug:
19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
Luan Nguyen [Thu, 12 Feb 2015 19:13:47 +0000 (19:13 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
Luan Nguyen [Thu, 12 Feb 2015 17:35:43 +0000 (17:35 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:35:38 +0000 (17:35 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Benjamin Franz [Thu, 12 Feb 2015 16:12:58 +0000 (16:12 +0000)]
Fix the javadocs for lock task mode intents.
Bug:
19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
The Android Automerger [Thu, 12 Feb 2015 14:11:27 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Eino-Ville Talvala [Thu, 12 Feb 2015 05:33:27 +0000 (05:33 +0000)]
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 03:51:05 +0000 (19:51 -0800)]
Fix accessibility focus bug in statusbar
The root view of the new uber statusbar should not be focusable.
Based on history, it looks like this was an oversight when this view
was refactored.
Fixes bug
19296202
Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
Lorenzo Colitti [Thu, 12 Feb 2015 02:30:55 +0000 (02:30 +0000)]
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Jeremy Joslin [Thu, 12 Feb 2015 00:51:13 +0000 (16:51 -0800)]
Update Javadoc for EXTRA_NETWORK.
Bug:
19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
Adam Powell [Thu, 12 Feb 2015 02:08:03 +0000 (02:08 +0000)]
Merge "Add DENSITY_280" into lmp-mr1-dev
Eino-Ville Talvala [Wed, 11 Feb 2015 23:41:12 +0000 (15:41 -0800)]
Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.
Bug:
16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
Adam Powell [Wed, 11 Feb 2015 21:34:43 +0000 (13:34 -0800)]
Add DENSITY_280
Bug
19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Michael Wright [Wed, 11 Feb 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
The Android Automerger [Wed, 11 Feb 2015 14:11:17 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Jeff Davidson [Wed, 11 Feb 2015 08:25:26 +0000 (08:25 +0000)]
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Jeff Davidson [Tue, 10 Feb 2015 18:02:11 +0000 (10:02 -0800)]
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.
Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.
Bug:
19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
Lorenzo Colitti [Wed, 11 Feb 2015 07:18:16 +0000 (07:18 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
Shishir Agrawal [Wed, 11 Feb 2015 03:02:38 +0000 (19:02 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
Lorenzo Colitti [Tue, 10 Feb 2015 22:39:20 +0000 (07:39 +0900)]
Make reportInetCondition revalidate if the report differs from our state
1. If reportInetCondition says the network is not working, and
the network is already marked not validated, don't revalidate
it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
network is not marked as validated, revalidated. This will
allow us to get out of a validated state quickly based on app
input (e.g., allowing GCM's exponential backoff timer to drive
revalidation instead of our 10-minute timer).
Bug:
19258761
Bug:
19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
Lorenzo Colitti [Thu, 5 Feb 2015 04:57:17 +0000 (13:57 +0900)]
Make getNetworkInfo() take into account VPN underlying networks.
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug:
19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
Leon Scroggins III [Tue, 10 Feb 2015 22:03:43 +0000 (22:03 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
Leon Scroggins III [Mon, 9 Feb 2015 20:42:19 +0000 (15:42 -0500)]
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
BUG:
19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
Shanea King-Roberson [Tue, 10 Feb 2015 20:17:53 +0000 (20:17 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:10:38 +0000 (20:10 +0000)]
am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
3162289445ebade804c422162578d328c4762372':
Adding videos for 5.0 changes and watch face development.
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (
7461154,
12765600)
bug:
7461154
bug:
12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Chris Warrington [Tue, 10 Feb 2015 19:56:31 +0000 (19:56 +0000)]
Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
Luan Nguyen [Tue, 10 Feb 2015 18:56:32 +0000 (18:56 +0000)]
am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:47:38 +0000 (18:47 +0000)]
am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
9b432bbece3cca6316b2638a947983e21c65917f':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Eric Gilmore [Tue, 10 Feb 2015 18:05:23 +0000 (18:05 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
automerge:
2b36779
* commit '
2b36779f30a511cc4439a519c95963280a779fdc':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:56:51 +0000 (17:56 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
99b91b2fd28888b20511316cb6f81b510b05cdf5':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
c9dbaf0483b0274879164806297180d260689f1f':
Doc change: refactor GCM docs to be platform-agnostic.
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.
bug:
15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
John Spurlock [Tue, 10 Feb 2015 14:10:21 +0000 (09:10 -0500)]
Doze: pulse less often.
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.
Bug:
19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
The Android Automerger [Tue, 10 Feb 2015 14:11:46 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Chris Warrington [Tue, 10 Feb 2015 05:04:46 +0000 (21:04 -0800)]
Fix AAPT daemon mode with paths containg spaces.
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423
Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
Svetoslav [Tue, 10 Feb 2015 01:14:28 +0000 (17:14 -0800)]
Accessibiltiy: missed update to the previous patch.
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
Baligh Uddin [Tue, 10 Feb 2015 00:57:19 +0000 (00:57 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
kmccormick [Fri, 12 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Doc change: refactor GCM docs to be platform-agnostic.
Fix for:
b/
17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
Andre Eisenbach [Tue, 10 Feb 2015 00:21:35 +0000 (00:21 +0000)]
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
Matthew Xie [Mon, 9 Feb 2015 21:50:56 +0000 (21:50 +0000)]
Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
Daniel Sandler [Mon, 9 Feb 2015 20:43:37 +0000 (20:43 +0000)]
Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
Amith Yamasani [Mon, 9 Feb 2015 19:59:26 +0000 (19:59 +0000)]
Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
Andre Eisenbach [Fri, 6 Feb 2015 04:06:33 +0000 (20:06 -0800)]
Add API to check if a Bluetooth connection is encrypted (1/2)
Bug:
19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
Rubin Xu [Mon, 9 Feb 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
Amith Yamasani [Fri, 6 Feb 2015 22:41:40 +0000 (14:41 -0800)]
Limit cache update to packages that have changed
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.
Bug:
19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
Adrian Roos [Thu, 15 Jan 2015 18:57:51 +0000 (19:57 +0100)]
Added TEXT_CHANGED event to PasswordTextView
Also creates a TextView-like accessibility node
and populates accessibility events with text if
required.
Bug:
18528774
Change-Id: I4a918a092b1e97879c31f54604cf957e01f4bc86
Rubin Xu [Mon, 9 Feb 2015 11:29:37 +0000 (11:29 +0000)]
Perform post installation operations directly if backup manager is disabled
bug:
19312753
Change-Id: I4acdd1e3af6a6be0c51affc42de167993c736b2f
The Android Automerger [Mon, 9 Feb 2015 14:10:14 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Adrian Roos [Fri, 6 Feb 2015 13:30:46 +0000 (14:30 +0100)]
Only request IME if password view is showing
Bug:
19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
Zhijun He [Sun, 8 Feb 2015 17:38:02 +0000 (17:38 +0000)]
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
Svet Ganov [Sat, 7 Feb 2015 03:23:31 +0000 (19:23 -0800)]
Accessibility: Handle a missed case when clicking focused views.
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.
bug:
19252492
Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
Zhijun He [Fri, 6 Feb 2015 21:49:51 +0000 (13:49 -0800)]
camera-metadata: clarify the AE precapture trigger spec
Doc only change.
Bug:
19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
Joe Fernandez [Sat, 7 Feb 2015 01:13:52 +0000 (01:13 +0000)]
am
66c06cf9: am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:08:46 +0000 (01:08 +0000)]
am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
d224fb8a6c86b0c26c5db570cead5f19ff7133bd':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 01:00:53 +0000 (01:00 +0000)]
am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
ba20f98c88b754b3a69d55963275e20ab2fba6bf':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs
Matthew Xie [Fri, 6 Feb 2015 22:09:54 +0000 (14:09 -0800)]
Separate the protection of mProxyServiceStateCallbacks from that of mService
The overuse of mManagerCallback caused a deaklock.
Bug:
19264190
Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
Michael Wright [Fri, 6 Feb 2015 22:08:13 +0000 (14:08 -0800)]
Stop active media projections on user switch.
Bug:
19278080
Change-Id: I63cc8aa12954d4de257b793967d3845a6f86dc3f
Svet Ganov [Fri, 6 Feb 2015 21:48:05 +0000 (21:48 +0000)]
Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
Svet Ganov [Fri, 6 Feb 2015 21:46:24 +0000 (21:46 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
Svet Ganov [Fri, 6 Feb 2015 20:41:17 +0000 (12:41 -0800)]
Accessibility: ignore children of a view with node provider.
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.
The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.
bug:
19297093
Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
Svet Ganov [Fri, 6 Feb 2015 18:12:32 +0000 (10:12 -0800)]
Accessibility: Handle a missed case when clicking focused views.
The clicking logic was missing the case where a child of the accessibility
focused view reacts to the injected down up events for clicking. This
results of a whole class of views being non-interactive. Now if an event
is targeting accessibility focus and the dispatching view group has this
focus, we clear the flag before dispatching to children, so they can
handle the event rather ignoring it becuase they are not accessibility
focused.
bug:
19252492
Change-Id: I6ac25bb7a50b35bb638ca4bfb9fc4198d08c2d4d
Neil Fuller [Fri, 6 Feb 2015 17:30:45 +0000 (17:30 +0000)]
Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
Kenny Guy [Fri, 6 Feb 2015 15:22:22 +0000 (15:22 +0000)]
Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
Neil Fuller [Fri, 6 Feb 2015 10:03:08 +0000 (10:03 +0000)]
Avoid static initialization of Layout from TextUtils
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.
There is a race condition:
When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().
Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.
This is not a fix, merely a workaround until the race can
be resolved.
Bug:
18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
Chong Zhang [Fri, 6 Feb 2015 02:06:23 +0000 (02:06 +0000)]
Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
Chong Zhang [Fri, 6 Feb 2015 00:46:06 +0000 (16:46 -0800)]
reset col position to 1 on row PAC
bug:
19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
Alan Viverette [Fri, 6 Feb 2015 00:19:43 +0000 (00:19 +0000)]
Merge "Mutate scroll bar drawables" into lmp-mr1-dev
Alan Viverette [Thu, 5 Feb 2015 23:58:56 +0000 (15:58 -0800)]
Mutate scroll bar drawables
Bug:
19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858