196844 Commits

Author SHA1 Message Date
Jeff Sharkey
a80d264be6 Fix crash looping SystemUI.
Bug: 22358954
Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
2015-07-08 16:11:55 -07:00
Roshan Pius
8f596907a5 Merge "Change sequence of call removal from Phone's db." into mnc-dev 2015-07-08 22:03:25 +00:00
Jorim Jaggi
6d712e06f7 Remove volume motion delay
Disable window animations, so we can start the show animation directly.

Bug: 21335976
Change-Id: I1d25d0ce46b9a068efed0a1561051072cda226a9
2015-07-08 21:57:14 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 21:55:54 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Roshan Pius
1ca6207a1e Change sequence of call removal from Phone's db.
Since the Call API's callbacks are now fired from handlers, they end up
changing the order in which the callbacks from the Phone and Call API's
are fired. To preserve the below ordering, we move the call removal from
Phone's db to after all the onCallDestoryedcallbacks have executed.
1. Call->onStateChanged
2. Call->onDetailsChanged
3. Call->onCallDestroyed
4. Phone->onCallRemoved

BUG: 22127504
Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
2015-07-08 14:47:36 -07:00
David Friedman
2a33526b70 am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '9568a412377eb5ef247f843c1845b433eb648645':
  Docs: Adds fugu system-image links and hashes for M-Preview.
2015-07-08 21:46:25 +00:00
David Friedman
9568a41237 am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '3d52c10e217c4a622b5e7c0767a46ab5d14e58ea':
  Docs: Adds fugu system-image links and hashes for M-Preview.
2015-07-08 21:33:35 +00:00
Robert Greenwalt
8b0f3873a0 Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev 2015-07-08 21:26:17 +00:00
Jeff Sharkey
14cbe52150 Kill MediaProvider during drastic changes.
Sadly MediaProvider makes a ton of assumptions about storage paths
not changing.  To ensure that it picks up radical storage changes,
kill it and let it restart to pick up new paths.

Also give ourselves a longer timeout when benchmarking.

Bug: 20275423
Change-Id: I9971c4667dabdc685cb23528443f085f152c461d
2015-07-08 14:06:40 -07:00
Adrian Roos
7f806ec228 Merge "Dump internal state of ImageWallpaper" into mnc-dev 2015-07-08 21:01:27 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
David Friedman
3d52c10e21 Docs: Adds fugu system-image links and hashes for M-Preview.
This is for English and non-English pages, alike.

Change-Id: I6ad68cee7d416279a5db0a39192fdca14f1f3709
2015-07-08 13:10:47 -07:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00
Tingting Wang
d55b348e62 Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
2015-07-08 12:55:22 -07:00
Alex Klyubin
d25093d2fd Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 2015-07-08 19:32:32 +00:00
Etan Cohen
3aa1b1e5ec Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev 2015-07-08 19:02:34 +00:00
Selim Cinek
a8c247e0b4 Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 2015-07-08 18:55:34 +00:00
Chien-Yu Chen
72333917a7 Camera: Enforce ZERO_SHUTTER_LAG mode
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
2015-07-08 11:55:19 -07:00
Etan Cohen
47051d8e6d Lock screen text: consider possible WFC service in APM
Bug: 22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
2015-07-08 11:38:25 -07:00
Jason Monk
fede4258fa Merge "Remove bang from not connected wifi" into mnc-dev 2015-07-08 17:26:34 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Geoff Mendal
4f5630e51d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 16:45:22 +00:00
Geoff Mendal
8c1dfcecc3 Import translations. DO NOT MERGE
Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import
2015-07-08 11:38:01 -05:00
Jeff Sharkey
a83bf1966e Use best volume description for MTP.
Otherwise we end up showing adopted storage devices as "Unknown."

Bug: 20275423
Change-Id: Ib42474fd5b3284b1e8eca7de8a4cfbb71a34a107
2015-07-08 09:29:24 -07:00
Jason Monk
7d0e5985de Remove bang from not connected wifi
Bug: 22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
2015-07-08 12:09:52 -04:00
Chris Wren
32c4802a8a Merge "provide a cleaner notification dump" into mnc-dev 2015-07-08 14:46:32 +00:00
Geoff Mendal
db586e69af Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:05:55 +00:00
Geoff Mendal
18d4eaf54a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:04:01 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Geoff Mendal
ec135f6ac5 Import translations. DO NOT MERGE
Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import
2015-07-08 06:54:50 -07:00
Geoff Mendal
510cd45455 Import translations. DO NOT MERGE
Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import
2015-07-08 06:48:51 -07:00
Geoff Mendal
20ad92460b Import translations. DO NOT MERGE
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
2015-07-08 06:43:44 -07:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
2015-07-08 14:37:28 +01:00
Dirk Dougherty
e3bb8e4306 am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit 'cc040d583b121e6a028e2dc47691d3f4f98c6e70':
  Doc change -- update trade practices link.
2015-07-08 11:49:01 +00:00
Zoltan Szatmary-Ban
a2de7fc9fc Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev 2015-07-08 11:44:35 +00:00
Zoltan Szatmary-Ban
8959276036 Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 2015-07-08 11:33:00 +00:00
Dirk Dougherty
cc040d583b am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '7e8358c6e5e97dc224be65890564d44a7a043461':
  Doc change -- update trade practices link.
2015-07-08 11:29:44 +00:00
Dirk Dougherty
7e8358c6e5 Merge "Doc change -- update trade practices link." into mnc-preview-docs 2015-07-08 11:14:02 +00:00
Dirk Dougherty
bc2434404e am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.
* commit '590a25a31367de154bca9556829bc0338cb4ca73':
  Doc change: add version notes for preview 2.
2015-07-08 11:03:39 +00:00
Zoltan Szatmary-Ban
4d2593d3f2 Merge "Make StorageMeasurement multiprofile aware." into mnc-dev 2015-07-08 10:54:10 +00:00
Dirk Dougherty
590a25a313 am 70f1aadd: Doc change: add version notes for preview 2.
* commit '70f1aadd4bc1bfc96ddee08c38a5ac67ae531344':
  Doc change: add version notes for preview 2.
2015-07-08 10:48:53 +00:00
Dirk Dougherty
70f1aadd4b Doc change: add version notes for preview 2.
Change-Id: Iacd3bf7bc3206f1a143bacbae5f3e7b7b5eefe7d
2015-07-08 03:33:29 -07:00
Dirk Dougherty
8ecba86260 am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs
* commit '638ecb76b096c1224c8bf5c2a0bb4d0dd0f15b2f':
  Docs: Localized landing pages for M Preview 2 release.
2015-07-08 10:10:10 +00:00
Dirk Dougherty
638ecb76b0 am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs
* commit '773861f01d7aa19288a138eff160587cbc5e4c81':
  Docs: Localized landing pages for M Preview 2 release.
2015-07-08 09:55:50 +00:00
David Friedman
d3967e3ffd am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.
* commit '0922b82a94fa8dc800945e96df03d30b1a14ac23':
  Docs: Updates to M Preview 2 Download pages.
2015-07-08 09:54:35 +00:00
Dirk Dougherty
773861f01d Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs 2015-07-08 08:52:37 +00:00
David Friedman
611fd4f6e5 Docs: Localized landing pages for M Preview 2 release.
Change-Id: Ie8f5f306cbc2188f99bfa2bfa21be40ac16c6725
2015-07-08 01:49:02 -07:00
David Friedman
0922b82a94 am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.
* commit 'a7e0bfa68aee147bbb060e3bf5f51759c9f66817':
  Docs: Updates to M Preview 2 Download pages.
2015-07-08 08:02:51 +00:00
David Friedman
a7e0bfa68a Docs: Updates to M Preview 2 Download pages.
Change-Id: Iae26d516ea942523fb29292aa3e68db6ffea99f1
2015-07-08 00:25:49 -07:00