Ye Wen
dd3b972309
Merge "Messaging auto persist switch (1/4)" into lmp-dev
2014-07-16 02:20:34 +00:00
Ye Wen
9966429dcd
Messaging auto persist switch (1/4)
...
b/14095333
Change-Id: I0860b662bceb250601c815028f377c28ad0e3159
2014-07-16 10:39:21 -07:00
Deepanshu Gupta
48fda5f169
am 6c57fc30: (-s ours) DO NOT MERGE - Fix LayoutLib.
...
* commit '6c57fc30198e8f3a2756aab6bc832450391eec94':
DO NOT MERGE - Fix LayoutLib.
2014-07-16 17:35:24 +00:00
Deepanshu Gupta
6c57fc3019
DO NOT MERGE - Fix LayoutLib.
...
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122
Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
2014-07-16 10:23:28 -07:00
Jeff Sharkey
5fcaa0c670
Merge "Clearing "cache" shouldn't include "code cache."" into lmp-dev
2014-07-16 16:25:13 +00:00
Jeff Sharkey
78f3cf971b
Clearing "cache" shouldn't include "code cache."
...
Bug: 16187224
Change-Id: I075b651d1ff89d4f0232497d28a6b11270cba4d9
2014-07-16 10:13:01 -07:00
Derek Tan
0ab985092b
Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev
2014-07-16 16:25:13 +00:00
Derek Tan
06b41ea23f
Remove @hide annotations from important carrier privileged APIs.
...
Most of these APIs are protected by MODIFY_PHONE_STATE or carrier
privilege. Some APIs are protected by READ_PHONE_STATE.
Change-Id: Ifa04b5fb6d4bb5f21af7f728bee7dcbf77c8583b
2014-07-16 09:32:57 -07:00
Andrew Solovay
c8fcb3bcdb
am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
...
* commit '575537759222e0277c3979e33342407aa7ca1a78':
cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b
am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs
...
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
NDK filesizes and hashes updated
2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a
am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs
...
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3
am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs
...
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
docs: add edu video highlights
2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e
am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs
...
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
docs: Replaced deprecated fill_parent with match_parent.
2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c
am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551
...
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
docs: Fixed typo in L Preview API Overview. bug: 15696551
2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b
am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486
...
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
docs: Fix typos in the L preview docs. Bug: 16240486
2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4
am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.
...
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
Fixed a randomly discovered typo and missing hyphen. Change not staged.
2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592
am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
...
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:22:57 +00:00
Robert Ly
8231174ec5
am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs
...
* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
NDK filesizes and hashes updated
2014-07-16 13:22:54 +00:00
Ricardo Cervera
b5cd197646
am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs
...
* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
2014-07-16 13:22:50 +00:00
Robert Ly
1374f6ea86
am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs
...
* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
docs: add edu video highlights
2014-07-16 13:22:47 +00:00
Andrew Solovay
0791c612b9
am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs
...
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
docs: Replaced deprecated fill_parent with match_parent.
2014-07-16 13:22:44 +00:00
Quddus Chong
b2b1c5fa89
am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551
...
* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
docs: Fixed typo in L Preview API Overview. bug: 15696551
2014-07-16 13:22:44 +00:00
Ricardo Cervera
0acf9d2f9a
am de138276: docs: Fix typos in the L preview docs. Bug: 16240486
...
* commit 'de138276f1c0a02f91e32f889639c629d883f948':
docs: Fix typos in the L preview docs. Bug: 16240486
2014-07-16 13:22:43 +00:00
David Friedman
ddf853e0ce
am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.
...
* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
Fixed a randomly discovered typo and missing hyphen. Change not staged.
2014-07-16 13:22:43 +00:00
Alex Klyubin
09f1c724e3
Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev
2014-07-16 13:12:22 +00:00
Jean-Michel Trivi
79f5cd1429
Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
...
Unhide MediaPlayer.setAudioAttributes() method.
Update javadoc to explicitly state that the factory methods
do not let you set the audio stream type, attributes or session.
Change-Id: I0d097c314db010698b035349befe0659ab4d1dde
2014-07-16 14:41:06 +00:00
Jeff Sharkey
4ed745d359
Add code cache directory for apps.
...
This provides a directory where apps can cache compiled or optimized
code generated at runtime. The platform will delete all files in
this location on both app and platform upgrade.
Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
2014-07-15 22:13:26 -07:00
Jeff Sharkey
78a130144b
Mark resource-only splits as hasCode=false.
...
PackageManagerService now skips dexopt for split APKs that don't
declare they have code. Also surface more detailed error messages
in logs.
Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
2014-07-15 20:18:39 -07:00
Jeff Sharkey
da96e137bc
Parse more split APK manifest details.
...
Allow split APKs to define activities, services, receivers,
providers, and metadata. However, support for many manifest items
are explicitly omitted.
Only dexopt split APKs that include code.
Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
2014-07-15 18:50:00 -07:00
Adam Connors
63602e56bc
Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
2014-07-16 01:00:53 +00:00
Andrew Solovay
f7cecf8f4b
am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
...
* commit 'c8fcb3bcdb71fe16624bea146a67b13c150adb82':
cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:36:16 +00:00
Robert Ly
0f4e428f7e
am e104012f: am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs
...
* commit 'e104012f1b4dc1ea1e34477403fae486c3db717d':
NDK filesizes and hashes updated
2014-07-16 13:36:10 +00:00
Ricardo Cervera
964ad7b04a
am 9e4db5b7: am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs
...
* commit '9e4db5b76ad11dd468d65e5030044d530872908f':
cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
2014-07-16 13:36:05 +00:00
Robert Ly
4c0b84badc
am 4460bff8: am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs
...
* commit '4460bff8b39907bc8e39e60a27b078f20c35cc62':
docs: add edu video highlights
2014-07-16 13:35:59 +00:00
Andrew Solovay
226faa0fe1
am 52f0b574: am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs
...
* commit '52f0b5740e97777658859edb8489bc3f4e6c0b16':
docs: Replaced deprecated fill_parent with match_parent.
2014-07-16 13:35:54 +00:00
Quddus Chong
1004a529b7
am 13fc31df: am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551
...
* commit '13fc31df3cdf441b2034c4526ce45f730d80777a':
docs: Fixed typo in L Preview API Overview. bug: 15696551
2014-07-16 13:35:49 +00:00
Ricardo Cervera
07c65d1f88
am 3b0909c4: am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486
...
* commit '3b0909c49b15a467f769d17aca4d44940d7bb28e':
docs: Fix typos in the L preview docs. Bug: 16240486
2014-07-16 13:35:44 +00:00
David Friedman
495e8d0fb1
am ede1910a: am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.
...
* commit 'ede1910aa4718bf0398a482eba4a89a9edfe4a67':
Fixed a randomly discovered typo and missing hyphen. Change not staged.
2014-07-16 13:35:25 +00:00
Adam Connors
655be2a98e
Revert "Remove enableSystemApp methods."
...
We need to go back to uninstalling system apps so we can
re-install non-default system applications through Play.
This reverts commit e3dbcd138c07f2d32ac84229d0a49052cc18d424.
Change-Id: I0a7af094614c4a10800971c82e10571f7312e079
2014-07-16 09:48:43 +00:00
Jason Monk
febcb9d42b
Merge "Finalizing lock-to-app UX" into lmp-dev
2014-07-16 00:53:22 +00:00
Sandeep Siddhartha
7ee0d45835
Merge "Hook in startRecogniton call" into lmp-dev
2014-07-16 02:25:05 +00:00
Jeff Sharkey
d0a2de06a7
Merge "Add code cache directory for apps." into lmp-dev
2014-07-16 16:25:13 +00:00
Sandeep Siddhartha
8ecaf5f5cf
Hook in startRecogniton call
...
Add required info to the sound model database: users & recognition modes
Change-Id: I6e12cbc6342a2767c0e3d8328c0a3be899ac9952
2014-07-15 18:36:09 -07:00
Ruben Brunk
d1f113d0f0
DO NOT MERGE: camera2: Performance potpourri.
...
Bug: 16208403
Bug: 15116722
Fixes many of the performance issues in the Camera2 API and
LEGACY mode CPU path, including:
- Only call getParameters/setParameters when the request has changed.
- Cache Request/Result objects.
- Cache object hashes for long-lived CameraMetadata, TypeReference,
and Key objects with frequently used hash methods.
- Switch to Command pattern instead of repeated if/equals calls.
in frequently hit CameraMetadata get/set methods.
- Move string construction for logging behind flags to avoid extra
StringBuilder calls in frequently acquired lock methods.
- Cache results from frequently used JNI calls in object Builders.
Change-Id: I77bc4a023d4fe8bc46efcf771ff18ee268dcb9a9
2014-07-16 01:23:39 +00:00
Dan Sandler
a3514c3a4d
Merge "Prevent dismissing autoredacted private notifications." into lmp-dev
2014-07-16 01:00:53 +00:00
Dan Sandler
0d3e62f3e0
Prevent dismissing autoredacted private notifications.
...
Bug: 16295169
Change-Id: Ic1a13ae1a501ae4a5633ef9c84c59ff13543eb1b
2014-07-16 12:04:06 -04:00
Dan Sandler
18bb4f9920
Clean up autoredaction text.
...
Also show the timestamp if the original notification does.
Bug: 16289371
Change-Id: I6898990629c036dc7c1a129609449e556f8afa72
2014-07-16 12:04:05 -04:00
Adrian Roos
d4e632bbb6
Merge "Fix windows not showing when SHOW_WHEN_LOCKED changes" into lmp-dev
2014-07-16 00:53:22 +00:00
John Spurlock
93d837fd01
Merge "Zen: handle exit conditions across reboots." into lmp-dev
2014-07-16 00:53:22 +00:00
Narayan Kamath
61e9bf246f
Fix install --abi for apps with no native code.
...
We will need to record the overriden ABI in the package
settings (and applicationInfo) so that we launch the app
with it.
Change-Id: Ib71aae69d006a4b0e85e7101c0e0cebf1a950997
2014-07-16 12:02:12 +01:00