OSDN Git Service
Jorim Jaggi [Fri, 20 Mar 2015 21:39:24 +0000 (14:39 -0700)]
Change light status bar tint color to spec
Bug:
19233606
Change-Id: I0586e006b6783d3af23defb67da666477484c1ee
Jim Miller [Thu, 2 Apr 2015 03:09:38 +0000 (03:09 +0000)]
Merge "Prepare to make Fingerprint API public."
Etan Cohen [Thu, 2 Apr 2015 03:07:28 +0000 (03:07 +0000)]
Merge changes from topic 'mwd-merge-040115'
* changes:
Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Merge commit '
d91f193' into merge2
Merge commit '
5718646' into merge2
Merge commit '
7aa0345' into merge2
Eric Gilmore [Thu, 2 Apr 2015 02:58:42 +0000 (02:58 +0000)]
am
82a7e2a8: am
a16d42cd: am
7278d89c: am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
82a7e2a8dde29613dacf2add9be0acc867ffb576':
Changing wording to reflect c2dm shutdown.
Elliott Hughes [Thu, 2 Apr 2015 02:58:34 +0000 (02:58 +0000)]
am
095428d2: am
d15958f6: am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
095428d262f1cb0cf09d8722fdd9a53661d7513b':
Early return in RemoteViewsAdapter is too late
Alan Viverette [Thu, 2 Apr 2015 02:51:22 +0000 (02:51 +0000)]
Merge "Scale month view for small screens, use verbatim span for AM/PM label"
Eric Gilmore [Thu, 2 Apr 2015 02:33:33 +0000 (02:33 +0000)]
am
a16d42cd: am
7278d89c: am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
a16d42cd4ff9ed66eda1d9b983058b598e7b60d1':
Changing wording to reflect c2dm shutdown.
Elliott Hughes [Thu, 2 Apr 2015 02:33:15 +0000 (02:33 +0000)]
am
d15958f6: am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
d15958f661c8748b811e6b12642321f4e47f2817':
Early return in RemoteViewsAdapter is too late
Jim Miller [Wed, 1 Apr 2015 00:24:34 +0000 (17:24 -0700)]
Prepare to make Fingerprint API public.
- move fingerprint support files into hardware area
- move jni into services/core
Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
Eric Laurent [Thu, 2 Apr 2015 02:03:02 +0000 (02:03 +0000)]
Merge "audio port: support multiple clients"
Scott Rowe [Thu, 2 Apr 2015 01:39:39 +0000 (01:39 +0000)]
am
bb18c2d4: am
0f2f0350: am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
bb18c2d4ab7ed592810eb9031a892fb4748ecadc':
docs: Building Live TV Apps
Alex Klyubin [Wed, 1 Apr 2015 21:41:28 +0000 (14:41 -0700)]
Add fingerprint-specific AndroidKeyStore API.
Bug:
18088752
Change-Id: I333d3ffc820d28ae678e28dafc2e8a24cb7eb073
Eric Gilmore [Thu, 2 Apr 2015 01:31:30 +0000 (01:31 +0000)]
am
7278d89c: am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
7278d89c1b51bc937e79021eae523dfd0f3d30a1':
Changing wording to reflect c2dm shutdown.
Alex Klyubin [Thu, 2 Apr 2015 01:24:53 +0000 (01:24 +0000)]
Merge "resolved conflicts for merge of
261e7a37 to master"
Alex Klyubin [Thu, 2 Apr 2015 01:21:35 +0000 (18:21 -0700)]
resolved conflicts for merge of
261e7a37 to master
Change-Id: If0a3389764965fe27bf567090a6e24069b61c544
Elliott Hughes [Thu, 2 Apr 2015 01:13:09 +0000 (01:13 +0000)]
am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
Early return in RemoteViewsAdapter is too late
Alex Klyubin [Thu, 2 Apr 2015 01:10:02 +0000 (01:10 +0000)]
am
66b96b59: am
78014a78: am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
66b96b59774838998b1e67f83f3d67be5cc3a3e2':
Use Keymaster-friendly validity dates.
Eric Gilmore [Thu, 2 Apr 2015 01:06:52 +0000 (01:06 +0000)]
am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
f2204720eac6fd959eb5a3732c0084636bc16095':
Changing wording to reflect c2dm shutdown.
Lorenzo Colitti [Thu, 2 Apr 2015 01:03:58 +0000 (01:03 +0000)]
Merge "Deal with null characters in string options."
Eric Gilmore [Thu, 2 Apr 2015 00:59:34 +0000 (00:59 +0000)]
am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
b2b93762b8165ee47f49765816fc7ba0428c371c':
Changing wording to reflect c2dm shutdown.
Eric Laurent [Wed, 25 Mar 2015 21:51:08 +0000 (14:51 -0700)]
audio port: support multiple clients
Add support for more than one audio port callback client per process.
Change-Id: I48051f27fa0b58ce4634b9db46ec8f2aa900398c
Kweku Adams [Thu, 2 Apr 2015 00:20:08 +0000 (00:20 +0000)]
Merge "Fixing issue related to printing out of display state and idle mode in the batterystats checkin."
Alan Viverette [Thu, 2 Apr 2015 00:14:45 +0000 (17:14 -0700)]
Scale month view for small screens, use verbatim span for AM/PM label
Also fixes initial day selection in DatePickerDialog.
Bug:
19933912
Bug:
19937345
Change-Id: I88264a192c087361dbf21b055e74e1facf2506bc
Seigo Nonaka [Thu, 2 Apr 2015 00:07:05 +0000 (00:07 +0000)]
Merge "Fix cursor position calculation."
Elliott Hughes [Wed, 1 Apr 2015 23:34:24 +0000 (23:34 +0000)]
Merge "Early return in RemoteViewsAdapter is too late"
Eric Gilmore [Wed, 1 Apr 2015 23:13:25 +0000 (23:13 +0000)]
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Kweku Adams [Wed, 1 Apr 2015 23:07:48 +0000 (16:07 -0700)]
Fixing issue related to printing out of display state and idle mode in the batterystats checkin.
Change-Id: I533bd53f375bf6d9f818a8e8aa75932986ad779b
Andreas Gampe [Wed, 1 Apr 2015 22:58:01 +0000 (22:58 +0000)]
Merge "resolved conflicts for merge of
844e44c9 to master"
Andreas Gampe [Wed, 1 Apr 2015 22:57:17 +0000 (15:57 -0700)]
resolved conflicts for merge of
844e44c9 to master
Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
ztenghui [Wed, 1 Apr 2015 22:41:39 +0000 (22:41 +0000)]
Merge "Start searching the dimension configuration for atlas from the biggest value."
Santos Cordon [Wed, 1 Apr 2015 22:38:25 +0000 (22:38 +0000)]
Merge "New generic intent for SIM Activation"
Santos Cordon [Wed, 1 Apr 2015 01:32:31 +0000 (18:32 -0700)]
New generic intent for SIM Activation
New hidden intents and permissions for a generic SIM-activation
activity. New activity will handle generic SIM setup requests and then
delegate to the appropriate activation method (OTASP, HFA,
CARRIER_SETUP).
Change-Id: I1b22200544abefe486ec961b67a6e77b4d15aec3
Luan Nguyen [Wed, 1 Apr 2015 22:09:55 +0000 (22:09 +0000)]
am
51d58c9f: am
e5bc03da: am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
51d58c9f216c727e35ebe2ce8fa253ca49434494':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 22:09:48 +0000 (22:09 +0000)]
am
fa0842fc: am
0c50a4f1: am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
fa0842fc2468da417a0e98d6fcdc0658105f5820':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 22:09:40 +0000 (22:09 +0000)]
am
9c0dbf40: am
b79d9912: am
b9b2801d: am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
9c0dbf4093aee08743b83cbee9de16eb146b5c3f':
docs: Add voice intent for starting a stopwatch
Bryce Lee [Wed, 1 Apr 2015 22:09:19 +0000 (22:09 +0000)]
am
d7e349e8: am
7eeaad24: am
7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
* commit '
d7e349e8cbfc290f1cbbf099b0b9c76e545f5357':
Do not use the status bar as the system decor layer if it is not visible.
Scott Rowe [Wed, 1 Apr 2015 21:58:23 +0000 (21:58 +0000)]
am
0f2f0350: am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
0f2f03506654e6669db64147e9f22340c24629e8':
docs: Building Live TV Apps
Wale Ogunwale [Wed, 1 Apr 2015 21:50:24 +0000 (21:50 +0000)]
Merge "Fixed NPE when trying to animate a windows whose display is gone."
Scott Rowe [Wed, 1 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
docs: Building Live TV Apps
ztenghui [Wed, 1 Apr 2015 20:26:08 +0000 (13:26 -0700)]
Start searching the dimension configuration for atlas from the biggest value.
The old way will almost always miss the MAX_SIZE * MAX_SIZE case.
Most of time, it will be fine.
But if the threshold is just fall a bit short from MAX_SIZE * MAX_SIZE, then
it is likely that no generated configuration can be bigger than the threshold.
At the same time, a power of 2 size texture is more likely be used in the new
way. Better for memory alignment (or usage) and potential performance.
b/
19966623
Change-Id: I4683fd5dea347158bc05d95cc7d777cc391b7fba
Scott Rowe [Wed, 1 Apr 2015 21:35:39 +0000 (21:35 +0000)]
am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
Seigo Nonaka [Wed, 1 Apr 2015 13:35:25 +0000 (22:35 +0900)]
Fix cursor position calculation.
The cursor position calculation of not well known CharSequence implementation
has problem. getTextRunCursor() returns the relative path of passed string
buffer, so need to fix the origin by adding the copied buffer origin.
BUG:
17448027
Change-Id: I413c553bfccbccee4a390b6c83aa09ac7fd04126
Raph Levien [Wed, 1 Apr 2015 21:11:40 +0000 (21:11 +0000)]
Merge "Add breakStrategy attribute to TextView"
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs
Chet Haase [Wed, 1 Apr 2015 20:54:43 +0000 (20:54 +0000)]
Merge "Fix Drawable.getOpacity() docs"
Alex Klyubin [Wed, 1 Apr 2015 20:48:17 +0000 (20:48 +0000)]
am
39b99186: am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
39b9918631061340361b7776ace9b9cd4b25be7c':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Wale Ogunwale [Wed, 1 Apr 2015 18:23:15 +0000 (11:23 -0700)]
Fixed NPE when trying to animate a windows whose display is gone.
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.
Also corrected some method names/scopes I ran across while debugging.
Bug:
19972099
Change-Id: Ib0ae7ede6c506f833bbdd66723b88e7504a61907
Chet Haase [Wed, 1 Apr 2015 20:37:09 +0000 (13:37 -0700)]
Fix Drawable.getOpacity() docs
Issue #
17140095 Drawable#getOpacity() is documented as ignoring custom alpha, e.g. setAlpha(). It is lying.
Change-Id: Iaef094be750c58a43e13491e7bf9d9b7e56e23d2
Alex Klyubin [Wed, 1 Apr 2015 20:38:07 +0000 (20:38 +0000)]
am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
97467d82a31964e36cb6bc32ac4cf00e884c190e':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Alex Klyubin [Wed, 1 Apr 2015 20:31:42 +0000 (20:31 +0000)]
am
78014a78: am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
78014a78155ad05ca2e0af600c0545377c04bdbd':
Use Keymaster-friendly validity dates.
Alan Viverette [Wed, 1 Apr 2015 20:24:17 +0000 (20:24 +0000)]
Merge "Fix docs"
Alan Viverette [Wed, 1 Apr 2015 20:23:06 +0000 (13:23 -0700)]
Fix docs
Bug:
20011464
Change-Id: Ifcda3e562a3baea474b824e5ac2adcd36e17ae60
Alex Klyubin [Wed, 1 Apr 2015 20:21:00 +0000 (20:21 +0000)]
am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
04047af628338aa7859ae1f24700e1e4e3ae63e7':
Use Keymaster-friendly validity dates.
Andreas Gampe [Wed, 1 Apr 2015 20:15:59 +0000 (20:15 +0000)]
am
7598a248: am
e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '
7598a248bdbeb58a4b40ad773f39137b0dde1137':
Frameworks/base: Use system property for cache prune counter
Luan Nguyen [Wed, 1 Apr 2015 20:15:55 +0000 (20:15 +0000)]
am
e5bc03da: am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
e5bc03da07489d603df4e02754e061b37b5978d0':
docs: Update ambient mode to mention disabling bitmap filtering
Alex Klyubin [Wed, 1 Apr 2015 20:15:52 +0000 (20:15 +0000)]
Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
Luan Nguyen [Wed, 1 Apr 2015 20:15:50 +0000 (20:15 +0000)]
am
0c50a4f1: am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
0c50a4f15cdd120eae331545888982dccdb7b8aa':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 20:15:46 +0000 (20:15 +0000)]
am
b79d9912: am
b9b2801d: am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b79d9912c7f54ca5c5f496753ee4a316e78ac17b':
docs: Add voice intent for starting a stopwatch
Andreas Gampe [Wed, 1 Apr 2015 20:10:22 +0000 (20:10 +0000)]
am
e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '
e816f917e0e1c21c8019436744284630f2408dc0':
Frameworks/base: Use system property for cache prune counter
Alex Klyubin [Wed, 1 Apr 2015 17:59:29 +0000 (10:59 -0700)]
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.
Bug:
19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
Luan Nguyen [Wed, 1 Apr 2015 20:05:17 +0000 (20:05 +0000)]
am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d7fe75d687935060557920ff2e515b7246958405':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 20:05:11 +0000 (20:05 +0000)]
am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
13803e43b3196378d26fac8104d211b1224cb9f1':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 20:05:05 +0000 (20:05 +0000)]
am
b9b2801d: am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b9b2801da423a1ce79b8738ef7ce8d8a6e4e8532':
docs: Add voice intent for starting a stopwatch
Alex Klyubin [Wed, 1 Apr 2015 20:01:00 +0000 (20:01 +0000)]
Merge "Use Keymaster-friendly validity dates."
Luan Nguyen [Wed, 1 Apr 2015 19:55:08 +0000 (19:55 +0000)]
am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
92aa846daf64119d5951453c0298f83115f26d48':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:55:02 +0000 (19:55 +0000)]
am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
03bafac781492fed392cb6bcdc8773a44076c705':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 19:54:52 +0000 (19:54 +0000)]
am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
docs: Add voice intent for starting a stopwatch
Andreas Gampe [Wed, 1 Apr 2015 19:52:26 +0000 (19:52 +0000)]
Merge "Frameworks/base: Use system property for cache prune counter"
Andreas Gampe [Tue, 31 Mar 2015 23:15:17 +0000 (16:15 -0700)]
Frameworks/base: Use system property for cache prune counter
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.
Bug:
19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
Luan Nguyen [Wed, 1 Apr 2015 19:43:57 +0000 (19:43 +0000)]
am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d01ada25155ed82644b9cc23313c04d3f1a5721a':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:43:54 +0000 (19:43 +0000)]
am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
649d839b82a8fafc99ae79ba1ad5fc12218391cb':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 19:43:39 +0000 (19:43 +0000)]
am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
7542c44ee45a195404eccf50a82df7903e2ecd9c':
docs: Add voice intent for starting a stopwatch
Wale Ogunwale [Wed, 1 Apr 2015 19:32:32 +0000 (12:32 -0700)]
fixed build breakage due to bad merge. again...
Change-Id: I601bade61837e4408be083530d10c48c0595b38c
Andrew Solovay [Wed, 1 Apr 2015 19:28:03 +0000 (19:28 +0000)]
Bryce Lee [Wed, 1 Apr 2015 19:27:27 +0000 (19:27 +0000)]
am
7eeaad24: am
7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
* commit '
7eeaad244cbd3ac49530b414fda29d8b23fae8ae':
Do not use the status bar as the system decor layer if it is not visible.
Luan Nguyen [Wed, 1 Apr 2015 19:24:29 +0000 (19:24 +0000)]
Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:23:20 +0000 (19:23 +0000)]
Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
Wale Ogunwale [Wed, 1 Apr 2015 19:22:16 +0000 (12:22 -0700)]
fixed build breakage due to bad merge.
Change-Id: I0c6da2e831bfbe770b16a8763513b3d2895f6f60
Luan Nguyen [Wed, 1 Apr 2015 19:21:39 +0000 (19:21 +0000)]
Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
Bryce Lee [Wed, 1 Apr 2015 19:15:11 +0000 (19:15 +0000)]
am
7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
* commit '
7a1454fe69bc2aa561874e550b05d5cb218bc047':
Do not use the status bar as the system decor layer if it is not visible.
Bryce Lee [Wed, 1 Apr 2015 19:09:33 +0000 (19:09 +0000)]
Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
Scott Rowe [Thu, 5 Feb 2015 19:46:10 +0000 (11:46 -0800)]
docs: Building Live TV Apps
Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
Alex Klyubin [Wed, 1 Apr 2015 18:57:38 +0000 (18:57 +0000)]
am
838f054f: am
a4ea4726: am
c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '
838f054f88447d575afff105810800d95dd3eb13':
Hook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 18:57:31 +0000 (18:57 +0000)]
am
93e029e0: am
f00cdf68: am
c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '
93e029e0066737f9f09f6dfef95dc664dc236b15':
A way to obtain KeyStore operation handle from crypto primitives.
Wale Ogunwale [Wed, 1 Apr 2015 18:50:31 +0000 (11:50 -0700)]
resolved conflicts for merge of
2094bf7b to master
Change-Id: I1820d186ca602bb3cd21a15f3c23f7d6d309d43b
Andrew Solovay [Wed, 1 Apr 2015 18:43:15 +0000 (18:43 +0000)]
am
3e3af524: am
79c587ed: am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
3e3af5247f7d811f0427bbc1f39fc0582e05f374':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:32:46 +0000 (18:32 +0000)]
am
79c587ed: am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
79c587eda40f3af622f9d1b81aa5a81682e985e4':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:21:31 +0000 (18:21 +0000)]
am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
aabcf5b562b6ebad59d1789c73d054782d5f25e4':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:11:01 +0000 (18:11 +0000)]
am
b2255d4f: docs: Fixed a typo.
* commit '
b2255d4f10230b51de373528aaee7b12cc9e2f2b':
docs: Fixed a typo.
Alex Klyubin [Wed, 1 Apr 2015 18:04:58 +0000 (18:04 +0000)]
am
a4ea4726: am
c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '
a4ea47269040963301101b1b1a28d598b41219b8':
Hook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 18:04:54 +0000 (18:04 +0000)]
am
f00cdf68: am
c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '
f00cdf68cd1b96f822b3711cd4e39c9ad903ce21':
A way to obtain KeyStore operation handle from crypto primitives.
Olawale Ogunwale [Wed, 1 Apr 2015 18:04:50 +0000 (18:04 +0000)]
am
4e88ecf4: am
086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '
4e88ecf4bc344557af31eb367e6e01b2d5b60471':
[ActivityManager] Reduce report wrong anr activity
Raph Levien [Wed, 25 Mar 2015 20:18:20 +0000 (13:18 -0700)]
Add breakStrategy attribute to TextView
This patch adds plumbing to TextView to control the strategy used
for breaking paragraphs into lines.
The default for TextView is "quality", while the default for EditText
is "simple", largely to avoid too much re-layout when editing.
StaticLayout now has a builder which provides access to more
functionality and is also cleaner than the old mechanism of having
lots of constructors with varying numbers of arguments. This patch
changes TextView to use that builder, and also contains cleanups
of the Builder within StaticLayout.
Change-Id: Iee3cf3a05a3e51ba0834554e4a3ec606e9cabca5
Bryce Lee [Wed, 1 Apr 2015 17:57:21 +0000 (10:57 -0700)]
Do not use the status bar as the system decor layer if it is not visible.
Doing so leads to cropping of the content view, which is smaller than the
screen size on some devices with improperly configured overscan values. It
can also lead to performance issues with some activity transition
animations on Wear.
Bug:
19928768
Change-Id: Ic50c2fedb1f8be9a8ea5166fef5a5665958601de
Alex Klyubin [Wed, 1 Apr 2015 17:57:06 +0000 (17:57 +0000)]
am
c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '
c461452eb78867032092b2fce14c2fcb3e7ab34e':
Hook in user authenticators and their exceptions.
Alex Klyubin [Wed, 1 Apr 2015 17:57:00 +0000 (17:57 +0000)]
am
c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '
c6cc9d820d007a6b11df2bb3274d40743e1f1d87':
A way to obtain KeyStore operation handle from crypto primitives.
Olawale Ogunwale [Wed, 1 Apr 2015 17:56:53 +0000 (17:56 +0000)]
am
086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '
086071e7306a73c9b3c5a56277884b4e19543b3e':
[ActivityManager] Reduce report wrong anr activity
Alex Klyubin [Wed, 1 Apr 2015 03:19:54 +0000 (20:19 -0700)]
Use Keymaster-friendly validity dates.
Keymaster HAL currently requires that key validity start and end dates
always be specified. The framework API does not. This CL expresses
the framework API's "not specified" instants to Keymaster as instants
in distant past or future.
Bug:
18088752
Change-Id: Ia9d66d5e57bfca30628cdef6e0925a2781a3acfb
Alex Klyubin [Wed, 1 Apr 2015 17:34:36 +0000 (17:34 +0000)]
Merge "Hook in user authenticators and their exceptions."