OSDN Git Service
Andre Eisenbach [Fri, 7 Nov 2014 00:33:41 +0000 (00:33 +0000)]
am
44c11b9d: am
df11d588: Fix crash during Bluetooth on/off stress test
* commit '
44c11b9d2a17a8364e53ee437884c5349ec88341':
Fix crash during Bluetooth on/off stress test
Andre Eisenbach [Fri, 7 Nov 2014 00:27:28 +0000 (00:27 +0000)]
am
df11d588: Fix crash during Bluetooth on/off stress test
* commit '
df11d588bb26ad0e8b8a6e8551393a0abeec2fef':
Fix crash during Bluetooth on/off stress test
Amit Mahajan [Fri, 7 Nov 2014 00:24:27 +0000 (00:24 +0000)]
am
fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev
* commit '
fc3f2380c97b0e2704b6350e031c96e0b01a3046':
Add configuration to control converting sms destination number
Luan Nguyen [Fri, 7 Nov 2014 00:24:22 +0000 (00:24 +0000)]
am
df8daa8c: am
db212613: am
816b93cf: am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
df8daa8c133100910a56a79298d75e7950503bf3':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:24:17 +0000 (00:24 +0000)]
am
0171ad2b: am
5851fb9b: am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
0171ad2bffa6daca994d3087c0577ace229adc99':
docs: fix for Brand inquiries form
Andre Eisenbach [Wed, 29 Oct 2014 19:13:38 +0000 (12:13 -0700)]
Fix crash during Bluetooth on/off stress test
Bug:
18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit
178d3b54cd50558be789c5dfd8dad80ffdc65021)
Amit Mahajan [Fri, 7 Nov 2014 00:17:40 +0000 (00:17 +0000)]
Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev
Luan Nguyen [Fri, 7 Nov 2014 00:17:02 +0000 (00:17 +0000)]
am
db212613: am
816b93cf: am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
db21261339f37666a23b5d1e7f8997af4439c0c2':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:16:58 +0000 (00:16 +0000)]
am
5851fb9b: am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
5851fb9b820eac653ff9010d49d96cb3df927203':
docs: fix for Brand inquiries form
Andres Morales [Fri, 7 Nov 2014 00:14:02 +0000 (00:14 +0000)]
am
3e5d6aa0: am
f33d9db4: am
b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit '
3e5d6aa04b3336984f28b3168ef95396848cc6de':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Jason Parks [Fri, 7 Nov 2014 00:13:57 +0000 (00:13 +0000)]
am
220b65d2: am
94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit '
220b65d21dcb332b9bb39e2c75a5adba5d7c73d9':
Fix NPE for CTS.
Jeff Hao [Fri, 7 Nov 2014 00:13:53 +0000 (00:13 +0000)]
am
c02d9a73: am
2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
* commit '
c02d9a73e389e27e603d667094dfa7d18a77fe98':
Change boot screen title to "Android is starting" when not upgrading.
Rich Slogar [Fri, 7 Nov 2014 00:13:48 +0000 (00:13 +0000)]
am
1d793503: am
d47ab00c: am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
1d793503bd423f04123f6ad56c28a5c99835383c':
docs:Remove tools/index.jd file.
Luan Nguyen [Fri, 7 Nov 2014 00:10:25 +0000 (00:10 +0000)]
am
816b93cf: am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
816b93cf23c59a8a17e998ca706619b9eaa23793':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:10:21 +0000 (00:10 +0000)]
am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
d00ce6c537242d8bf6f01122f7faebfc07652e87':
docs: fix for Brand inquiries form
Andres Morales [Fri, 7 Nov 2014 00:06:25 +0000 (00:06 +0000)]
am
f33d9db4: am
b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit '
f33d9db43a30299e2dfd3585c0964af953766a09':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Jason Parks [Fri, 7 Nov 2014 00:05:47 +0000 (00:05 +0000)]
am
94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit '
94c3e3bfcfe8d91283560082c737cb62e8d06742':
Fix NPE for CTS.
Jeff Hao [Fri, 7 Nov 2014 00:05:43 +0000 (00:05 +0000)]
am
2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
* commit '
2a83226c7585895d08d3320a4bb881f3659ad0d9':
Change boot screen title to "Android is starting" when not upgrading.
Rich Slogar [Fri, 7 Nov 2014 00:05:38 +0000 (00:05 +0000)]
am
d47ab00c: am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
d47ab00cc4f15287c8b48ed5805c4e9766facb58':
docs:Remove tools/index.jd file.
Luan Nguyen [Fri, 7 Nov 2014 00:05:20 +0000 (00:05 +0000)]
am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:05:16 +0000 (00:05 +0000)]
am
1d295821: docs: fix for Brand inquiries form
* commit '
1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
ztenghui [Fri, 7 Nov 2014 00:04:34 +0000 (00:04 +0000)]
am
7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev
* commit '
7ae6fc81efd05a7561ee2de853184d2a3788b88d':
A better looking and faster spot shadow.
ztenghui [Thu, 6 Nov 2014 23:59:15 +0000 (23:59 +0000)]
Merge "A better looking and faster spot shadow." into lmp-mr1-dev
Andres Morales [Thu, 6 Nov 2014 23:57:25 +0000 (23:57 +0000)]
am
b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit '
b1477d11ca873db761dd378a5fea93b26d695f78':
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Yohei Yukawa [Thu, 6 Nov 2014 23:57:17 +0000 (23:57 +0000)]
Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
automerge:
50ef3d9
* commit '
50ef3d93adf2614d8394664626b706ab0d7f7de7':
Minimize the number of default enabled IMEs part 4
Andres Morales [Thu, 6 Nov 2014 23:50:56 +0000 (23:50 +0000)]
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
Yohei Yukawa [Thu, 6 Nov 2014 23:45:19 +0000 (23:45 +0000)]
Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
Andres Morales [Tue, 4 Nov 2014 22:56:16 +0000 (14:56 -0800)]
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
destradaa [Thu, 6 Nov 2014 23:34:06 +0000 (23:34 +0000)]
Merge "Add support for GPS measurement/navigation message capabilities. b/
16727892 b/
16815124" into lmp-mr1-dev
automerge:
992b9aa
* commit '
992b9aa37b0b7dba45505593cc4715d5be5aecbb':
Add support for GPS measurement/navigation message capabilities. b/
16727892 b/
16815124
Luan Nguyen [Thu, 6 Nov 2014 23:26:51 +0000 (23:26 +0000)]
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
destradaa [Thu, 6 Nov 2014 23:22:41 +0000 (23:22 +0000)]
Merge "Add support for GPS measurement/navigation message capabilities. b/
16727892 b/
16815124" into lmp-mr1-dev
ztenghui [Wed, 29 Oct 2014 23:04:29 +0000 (16:04 -0700)]
A better looking and faster spot shadow.
1. This improve the looking, the star shape (spike) on long action bar is gone.
Shadow is more smooth now.
2. The performance is better, too. For averaging around rect, round rect and
circle, the spot shadow itself is 3 times faster. On N7 v1, it could be less than
0.1 ms.
b/
14976551
b/
16712006
Change-Id: I61ed546ee56e7c8dbe504dfcaef12d084904b4b8
Joe Fernandez [Thu, 6 Nov 2014 22:53:04 +0000 (14:53 -0800)]
docs: fix for Brand inquiries form
b/
18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
Craig Mautner [Thu, 6 Nov 2014 22:24:52 +0000 (22:24 +0000)]
Add logging for failure to finish.
automerge:
a11bb74
* commit '
a11bb7427171418681428754051d5ee4dce851ee':
Add logging for failure to finish.
Sreeram Ramachandran [Thu, 6 Nov 2014 22:23:36 +0000 (22:23 +0000)]
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
automerge:
0cb1bc4
* commit '
0cb1bc488c6578fde1503c53405715c564f0f7a0':
Send broadcasts when VPNs come and go.
Jason Parks [Thu, 6 Nov 2014 22:23:01 +0000 (22:23 +0000)]
Merge "Fix NPE for CTS." into lmp-sprout-dev
destradaa [Thu, 6 Nov 2014 22:22:35 +0000 (22:22 +0000)]
Merge "Fix reference leak in GPS measurement JNI layer. b/
16727892 b/
17075171" into lmp-mr1-dev
automerge:
c3e5599
* commit '
c3e5599cdc09a770d12433a98e7da93ec24d959d':
Fix reference leak in GPS measurement JNI layer. b/
16727892 b/
17075171
Craig Mautner [Thu, 6 Nov 2014 21:59:49 +0000 (13:59 -0800)]
Add logging for failure to finish.
Will help with bug
17648830.
Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
Sreeram Ramachandran [Thu, 6 Nov 2014 21:57:20 +0000 (21:57 +0000)]
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
destradaa [Thu, 6 Nov 2014 21:50:39 +0000 (21:50 +0000)]
Merge "Fix reference leak in GPS measurement JNI layer. b/
16727892 b/
17075171" into lmp-mr1-dev
RoboErik [Thu, 6 Nov 2014 21:42:55 +0000 (21:42 +0000)]
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
automerge:
b1d52e1
* commit '
b1d52e1d2095d0df986d4c338af43c5cd2b6efc5':
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
Sailesh Nepal [Thu, 6 Nov 2014 21:41:44 +0000 (21:41 +0000)]
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
automerge:
7d901cb
* commit '
7d901cb6f54f31b01b9951599ba6abdcff580e42':
Make APIs to get system phone accounts public
Jeremy Joslin [Thu, 6 Nov 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
automerge:
1a2b99e
* commit '
1a2b99ea2692a357f68368f7117bc529ef5dab06':
Implemented requestNetwork with a PendingIntent.
Amith Yamasani [Thu, 6 Nov 2014 21:37:06 +0000 (21:37 +0000)]
Merge "Fix singleUser provider grants" into lmp-mr1-dev
automerge:
775d104
* commit '
775d104db29dc8bdd8922fd7627cf646869d90c8':
Fix singleUser provider grants
Craig Mautner [Thu, 6 Nov 2014 21:34:25 +0000 (21:34 +0000)]
Merge "More fixes for keyguard animations." into lmp-mr1-dev
automerge:
7b1b0f6
* commit '
7b1b0f63bcb76585621e856ecc8c8b71450735ee':
More fixes for keyguard animations.
RoboErik [Thu, 6 Nov 2014 21:20:17 +0000 (21:20 +0000)]
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
* changes:
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
Sailesh Nepal [Thu, 6 Nov 2014 21:06:34 +0000 (21:06 +0000)]
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
Jeremy Joslin [Thu, 6 Nov 2014 20:51:23 +0000 (20:51 +0000)]
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
Amith Yamasani [Thu, 6 Nov 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Fix singleUser provider grants" into lmp-mr1-dev
Craig Mautner [Thu, 6 Nov 2014 20:49:35 +0000 (20:49 +0000)]
Merge "More fixes for keyguard animations." into lmp-mr1-dev
Jeff Hao [Thu, 6 Nov 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
Vinod Krishnan [Thu, 6 Nov 2014 20:41:35 +0000 (20:41 +0000)]
am
efec89f2: am
1d6d4272: Adding wallpaper animations
* commit '
efec89f2edd09c021e4e52f9aa37b6a6ca6f31b8':
Adding wallpaper animations
Ricardo Cervera [Thu, 6 Nov 2014 20:41:31 +0000 (20:41 +0000)]
am
a2c2014d: am
126eda32: am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
a2c2014d399c9637c06614872c6d5c08d33a1267':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 20:41:26 +0000 (20:41 +0000)]
am
b282cc30: am
3bde026a: am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
b282cc308f13a464c7e2455e5b2b67c622ffce30':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 20:41:21 +0000 (20:41 +0000)]
am
f90d9c23: am
0a285d4a: am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
f90d9c235435116fbefc8b92f73553355ccec87e':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Dirk Dougherty [Thu, 6 Nov 2014 20:41:17 +0000 (20:41 +0000)]
am
1d270087: am
61a76f2d: am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
1d270087a30a3610c56c65700f61c800a9797dc3':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 20:41:11 +0000 (20:41 +0000)]
am
0b315994: am
2acfc3b9: am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
0b315994f079be109d5ddcfff382b5c72c85bad6':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 20:41:06 +0000 (20:41 +0000)]
am
0c03031b: am
93f89657: am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
0c03031b3e4db987df8af25360f97f4d5c3207ea':
docs: Add more information for getting started with TV app
Justin Koh [Thu, 6 Nov 2014 20:40:56 +0000 (20:40 +0000)]
am
2d42f484: am
b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
2d42f484494e4183c42114ce5918fc4592a33fb6':
Hide Surface#lockHardwareCanvas DO NOT MERGE
Dirk Dougherty [Thu, 6 Nov 2014 20:40:50 +0000 (20:40 +0000)]
am
012849f4: am
c6f2ec20: am
b2fe15f9: am
66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
* commit '
012849f452ee7cc72a28df3054fdbe68b5133cee':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
Rich Slogar [Thu, 6 Nov 2014 20:39:18 +0000 (20:39 +0000)]
am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
830790baf8c35942832c5e7fb2467be6112048f4':
docs:Remove tools/index.jd file.
Vinod Krishnan [Thu, 6 Nov 2014 20:34:58 +0000 (20:34 +0000)]
am
1d6d4272: Adding wallpaper animations
* commit '
1d6d427278d22d08ef60e5d76162b823e8ad58ed':
Adding wallpaper animations
Ricardo Cervera [Thu, 6 Nov 2014 20:34:53 +0000 (20:34 +0000)]
am
126eda32: am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
126eda32ebc1c61ff0a6a7a93093c71f2ac73d43':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 20:34:49 +0000 (20:34 +0000)]
am
3bde026a: am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
3bde026aebffdaea8ab1315977b05e53e4a75185':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 20:34:45 +0000 (20:34 +0000)]
am
0a285d4a: am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
0a285d4a3483011a57ecd4201db3fd38bb1d628f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Dirk Dougherty [Thu, 6 Nov 2014 20:34:28 +0000 (20:34 +0000)]
am
61a76f2d: am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
61a76f2d7919cd6375cf4463b8bd69a608057d93':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 20:34:18 +0000 (20:34 +0000)]
am
2acfc3b9: am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
2acfc3b9e2aca9277e8e4763352fc2976d0c2094':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 20:34:14 +0000 (20:34 +0000)]
am
93f89657: am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
93f8965768484e758c2c87b919340ee932fcfd9d':
docs: Add more information for getting started with TV app
Justin Koh [Thu, 6 Nov 2014 20:33:36 +0000 (20:33 +0000)]
am
b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
Rich Slogar [Thu, 6 Nov 2014 20:33:30 +0000 (20:33 +0000)]
am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
b0af6987aacec95b90c655f7e9bd9576baaab3df':
docs:Remove tools/index.jd file.
Dirk Dougherty [Thu, 6 Nov 2014 20:33:12 +0000 (20:33 +0000)]
am
c6f2ec20: am
b2fe15f9: am
66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
* commit '
c6f2ec20a6a8ed30801debf9715aff3ddb982933':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
John Spurlock [Thu, 6 Nov 2014 20:31:08 +0000 (20:31 +0000)]
am
d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev
* commit '
d69dacb06f98e85f5624737f376e89108f11cb23':
Zen: Track next-alarm condition across reboots.
Rich Slogar [Thu, 6 Nov 2014 20:30:10 +0000 (20:30 +0000)]
Merge "docs:Remove tools/index.jd file." into lmp-docs
John Spurlock [Thu, 6 Nov 2014 20:27:06 +0000 (20:27 +0000)]
Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev
Sailesh Nepal [Thu, 6 Nov 2014 05:30:43 +0000 (21:30 -0800)]
Make APIs to get system phone accounts public
This is used by Wi-Fi calling to handoff and incoming
call to a cellular call.
For example, when doing an handoff we can look through
the outgoing phone accounts and find the one that the user
has verified with their google account. We can then
handoff to that phone account.
Bug:
17686424
Change-Id: I06d42aa8f4a36d11e5293ed6f7c62b796226f5c1
Jason Monk [Thu, 6 Nov 2014 20:17:11 +0000 (20:17 +0000)]
am
265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev
* commit '
265160e03a9e3447a4874e5820108730dcd05194':
Show recents button while pinned and locked
Craig Mautner [Thu, 6 Nov 2014 20:13:23 +0000 (12:13 -0800)]
More fixes for keyguard animations.
Add a state machine for calling comeOutOfSleepIfNeededLocked() so
that it is only called after the lockscreen has started dismissing
but not before resumeTopActivityLocked(). Also keep
resumeTopActivityLocked() from being called from
comeOutOfSleepIfNeededLocked() recursively.
Have starting windows count towards notifying the keyguard that a
window has been drawn.
Do not update wallpaper animations based on their not being included
in the windows being animated if there are no windows being animated.
And always improve logging.
Fixes bug
15991916.
Change-Id: I0d21c5337f0e89d9eacc8dab2cdaa52fec43ac0b
Jason Monk [Thu, 6 Nov 2014 20:13:06 +0000 (20:13 +0000)]
Merge "Show recents button while pinned and locked" into lmp-mr1-dev
Jason Parks [Thu, 6 Nov 2014 20:08:52 +0000 (14:08 -0600)]
Fix NPE for CTS.
The effect list can be empty and will return null
from native code. This fixes the CTS crash.
Bug:
18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
xinhe [Thu, 6 Nov 2014 19:56:06 +0000 (19:56 +0000)]
am
8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev
* commit '
8161ed8121f88d58cb7a2bab3a7197e3d661ba49':
RSSI indicator says that SIMless device has a SIM
xinhe [Thu, 6 Nov 2014 19:50:44 +0000 (19:50 +0000)]
Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev
Jeremy Joslin [Wed, 5 Nov 2014 18:32:09 +0000 (10:32 -0800)]
Implemented requestNetwork with a PendingIntent.
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.
Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.
Bug:
17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
Winson Chung [Thu, 6 Nov 2014 19:26:17 +0000 (19:26 +0000)]
am
5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-mr1-dev
* commit '
5191861c8896bf4ceaca2dc210423a7f86924644':
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Winson Chung [Thu, 6 Nov 2014 19:26:11 +0000 (19:26 +0000)]
am
e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug
18160176)" into lmp-mr1-dev
* commit '
e0325fe956c2a33b79added92f0e53be2246506a':
Don't reload the layout every time we enter Recents. (Bug
18160176)
ztenghui [Thu, 6 Nov 2014 19:25:46 +0000 (19:25 +0000)]
am
786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev
* commit '
786d0a0353cdbd335b50c6b560073d8d21ec2ee8':
VD:test:Remove open animation AVD
Winson Chung [Thu, 6 Nov 2014 19:20:58 +0000 (19:20 +0000)]
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-mr1-dev
Winson Chung [Thu, 6 Nov 2014 19:20:55 +0000 (19:20 +0000)]
Merge "Don't reload the layout every time we enter Recents. (Bug
18160176)" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 21:12:27 +0000 (16:12 -0500)]
Zen: Track next-alarm condition across reboots.
During a reboot, wait for the initial alarm registration -
which is traditionally done in response to ACTION_BOOT_COMPLETED.
Bug:
16373455
Change-Id: I00dd737fa5c9ea15d646779c5b92e5637a69595a
xinhe [Wed, 5 Nov 2014 22:55:03 +0000 (14:55 -0800)]
RSSI indicator says that SIMless device has a SIM
For dummy case, subId = -1/-2, we need compare the phoneId
Bug:
18247106
Change-Id: I310d8b466ef83936e920d3921267241f42c2243f
RoboErik [Thu, 6 Nov 2014 18:55:06 +0000 (10:55 -0800)]
Update metadata artwork and uri docs
This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.
Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
John Reck [Thu, 6 Nov 2014 18:55:00 +0000 (18:55 +0000)]
Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev
automerge:
9c13b8c
* commit '
9c13b8cfcc6e1d8b422488596538bd8b1f38df57':
Yank ResourceCache out of Caches
ztenghui [Thu, 6 Nov 2014 18:54:48 +0000 (18:54 +0000)]
Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:52:29 +0000 (18:52 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge:
c7f1ae8
* commit '
c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
Fix NPE when parceling SubInfoRecord
John Reck [Thu, 6 Nov 2014 18:48:16 +0000 (18:48 +0000)]
Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:25:48 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
John Reck [Thu, 6 Nov 2014 17:45:10 +0000 (09:45 -0800)]
Yank ResourceCache out of Caches
Bug:
17947547
Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context
Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
Vinod Krishnan [Wed, 5 Nov 2014 17:16:30 +0000 (09:16 -0800)]
Adding wallpaper animations
- this has the best behavior. Sometimes the behavior is not consistent
Bug:
18058382
Change-Id: I744169ea333d3cef9d7b3618b940280aa8db4dc3
Ricardo Cervera [Thu, 6 Nov 2014 17:19:00 +0000 (17:19 +0000)]
am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
b4a1919816f4563390f2416038a66cd36b4f06aa':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 17:14:35 +0000 (17:14 +0000)]
am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 17:13:58 +0000 (17:13 +0000)]
am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200