Craig Mautner
b4998eec3c
Fix loop limits.
...
Fixes bug 12207606.
Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
2014-03-19 14:09:59 -07:00
Lajos Molnar
0dc0848653
am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
...
* commit 'f7b33e8656599ed3e0edd834a03a0366b0f655bb':
MediaPlayer: fix int overflow issue in MediaTimeProvider
2014-03-19 20:46:48 +00:00
Lajos Molnar
f7b33e8656
Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
2014-03-19 20:43:23 +00:00
Adam Cohen
0dca4fc929
am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
...
* commit '55b523cc3fac7fd008094b690a0fa8c5527d569c':
[DO NOT MERGE] Fix wallpaper cropping bugs
2014-03-19 20:18:41 +00:00
Adam Cohen
cc8fbb5999
am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
...
* commit '8acbe8887a753c0d2e86153d00cf426781c19cf2':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
2014-03-19 20:18:37 +00:00
Adam Cohen
55b523cc3f
Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
2014-03-19 20:16:11 +00:00
Adam Cohen
8acbe8887a
Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
2014-03-19 20:15:41 +00:00
Chris Craik
5d39a77992
Fix projection offset caching - DO NOT MERGE
...
bug:13214038
Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.
Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
(cherry picked from commit d04a6b15f74035fd2068f34225825b55e94521f4)
2014-03-19 20:09:04 +00:00
Jeff Brown
80af531624
am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
...
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
2014-03-19 20:05:40 +00:00
Jeff Brown
f260ed0926
Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
2014-03-19 20:01:42 +00:00
Lajos Molnar
0cab07d788
MediaPlayer: fix int overflow issue in MediaTimeProvider
...
Bug: 13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
2014-03-19 11:35:17 -07:00
Michael Jurka
929e75e8d0
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
...
Bug: 12034934
Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit 2ab14daebac46307d2364733481edc3115bbf98c)
2014-03-19 17:57:17 +00:00
Michael Jurka
c82618c660
[DO NOT MERGE] Fix wallpaper cropping bugs
...
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit e39c9a953ca11319b747b3aa79f4ccd082b775b7)
Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
2014-03-19 17:56:55 +00:00
Baligh Uddin
7cf3e334be
Import translations. DO NOT MERGE
...
Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
Auto-generated-cl: translation import
2014-03-19 09:48:18 -07:00
Robert Greenwalt
bd84f01c6c
am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
...
* commit '5d3d4ee3005e910dce780074d3f68d594aa12070':
Handle provisioning APN by turning off/on data.
2014-03-19 16:15:22 +00:00
Robert Greenwalt
5d3d4ee300
Merge "Handle provisioning APN by turning off/on data." into klp-dev
2014-03-19 16:12:01 +00:00
Dan Sandler
95a7829c27
am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
...
* commit 'b78dc69c2be43852dcd7150db2b545f9b4110232':
DO NOT MERGE: Maintain binding to crashed listeners.
2014-03-19 13:08:53 +00:00
Dan Sandler
b78dc69c2b
Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
2014-03-19 13:04:01 +00:00
Jeff Brown
aba566589e
Fix inverted conditional in View.setFilterTouchesWhenObscured.
...
Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
2014-03-18 17:59:21 -07:00
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