OSDN Git Service
Michael Kwan [Mon, 16 Nov 2015 20:59:37 +0000 (12:59 -0800)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.
The hack stops this behaviour, and also sets MTP mode back to none.
Bug:
25547826
Bug:
25582050
Bug:
25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
Eino-Ville Talvala [Mon, 16 Nov 2015 20:16:45 +0000 (20:16 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8
am:
0691d16759
* commit '
0691d16759bf58a93209d4ab156e96f96fed7092':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:07:02 +0000 (20:07 +0000)]
Camera: Minor documentation update
am:
0b6e1bfae8
* commit '
0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
Camera: Minor documentation update
Erik Wolsheimer [Fri, 13 Nov 2015 19:54:47 +0000 (11:54 -0800)]
Log errno when dup fd cannot be allocated
BUG:
25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
Geoff Mendal [Mon, 16 Nov 2015 13:18:40 +0000 (14:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Minor documentation update
- Further clarify hardware.camera feature being only for the back camera
Bug:
24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
Winson Chung [Fri, 13 Nov 2015 18:37:15 +0000 (18:37 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec
am:
ef15ca85d7
* commit '
ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:29:33 +0000 (18:29 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours
am:
d45a18c8ec
* commit '
d45a18c8eca074f8c83a64ed465021a61becb49a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:55 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0
am:
32265b9ea0 -s ours
* commit '
32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:29 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d
am:
3e9f2b7894
* commit '
3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:35 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
am:
dce0f8040d
* commit '
dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:47 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Filip Gruszczynski [Fri, 13 Nov 2015 17:15:14 +0000 (17:15 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
Wale Ogunwale [Wed, 30 Sep 2015 17:09:39 +0000 (10:09 -0700)]
Initialize DisplayContent base info when object is constructed
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.
Bug:
22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
Shreyas Basarge [Fri, 13 Nov 2015 02:41:55 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b am:
c9eb8b4367
am:
c4a9c319e5
* commit '
c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:35:51 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b
am:
c9eb8b4367
* commit '
c9eb8b436715ba9b59382759cf0dcf991ed33594':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:29:47 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d
am:
64bdb9f06b
* commit '
64bdb9f06b7fc3e497088243a966dec95d1936e1':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e
am:
359ee7f47d
* commit '
359ee7f47de2eee82951abed294e4db44405973c':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:23:37 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc am:
af5c9f809c
am:
69ee300c90
* commit '
69ee300c90288fba6c3f81a37fd347892009e42e':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4
am:
bf29f10c1e
* commit '
bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:16:19 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc
am:
af5c9f809c
* commit '
af5c9f809cf7bbb890036a6411504a92e0d507ca':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af
am:
44368e6dd4
* commit '
44368e6dd4ec56e9eca47b1e81d307f672bb3006':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74
am:
c455148edc
* commit '
c455148edce05b4862df8853a78276fb5f28151a':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f
am:
6d13650c74
* commit '
6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812
am:
f5f03a19af
* commit '
f5f03a19affc6775ac3e44a3540351e132fffc0e':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8
am:
cc7c1d3812
* commit '
cc7c1d381249edfd906cb57afbd8589e6c345141':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2
am:
a0d20db02f
* commit '
a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece
am:
34b700a7c2
* commit '
34b700a7c2355f1dbea4b8d796619033bdd87a0c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705
am:
294611faa8
* commit '
294611faa8bd1bdbf75adc3cee835b69d348df86':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
c0f39c1ece
* commit '
c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
2f137b7705
* commit '
2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
Sanket Padawe [Thu, 12 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
am:
5b6ad87630
* commit '
5b6ad87630756751471f7224672328d955c8f2fb':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Thu, 12 Nov 2015 23:53:25 +0000 (23:53 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
Joe LaPenna [Thu, 12 Nov 2015 23:08:48 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
Joe LaPenna [Thu, 12 Nov 2015 23:08:42 +0000 (23:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
Shreyas Basarge [Thu, 12 Nov 2015 15:32:44 +0000 (15:32 +0000)]
Sync extras bundle comparison can throw NPE
Bug:
23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
Amith Yamasani [Wed, 11 Nov 2015 20:46:02 +0000 (12:46 -0800)]
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Bug:
25355086
Change-Id: I65946e5afa841215f161fc25ad70b31a108a33c3
(Cherrypicked from
ccf7d9e8ce11fd44e5b70b375ce25bed93e7153c)
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
BUG:
25355086
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from
4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
Eino-Ville Talvala [Thu, 12 Nov 2015 01:18:12 +0000 (01:18 +0000)]
Camera: Documentation updates am:
d8407271ff
am:
37e78cf8f1
* commit '
37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
Camera: Documentation updates
Eino-Ville Talvala [Thu, 12 Nov 2015 01:10:07 +0000 (01:10 +0000)]
Camera: Documentation updates
am:
d8407271ff
* commit '
d8407271ffa83d27e9a524f485a0799e422e1fd6':
Camera: Documentation updates
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug:
24540625
Bug:
23908116
Bug:
23051627
Bug:
17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
Daniel Koulomzin [Wed, 11 Nov 2015 23:23:18 +0000 (23:23 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool.
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Sanket Padawe [Wed, 11 Nov 2015 23:01:35 +0000 (15:01 -0800)]
Don't allow contact sharing by default for device not recognized as carkit.
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.
Bug:
23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
Ian Pedowitz [Wed, 11 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
am:
88d4cc1001
* commit '
88d4cc100175a54be3b7d560a91c38197f59f4bf':
Revert "Fix race condition when setting default ringtones"
Ian Pedowitz [Wed, 11 Nov 2015 21:39:11 +0000 (21:39 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev
Ian Pedowitz [Wed, 11 Nov 2015 21:38:04 +0000 (21:38 +0000)]
Revert "Fix race condition when setting default ringtones"
This reverts commit
f2cb9341ff864e6d9cc6797857665b2281643a74.
Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
Geoff Mendal [Wed, 11 Nov 2015 17:56:56 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Winson [Wed, 4 Nov 2015 22:24:43 +0000 (14:24 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
Winson [Wed, 11 Nov 2015 00:19:38 +0000 (16:19 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (18:41 +0100)]
Import translations. DO NOT MERGE
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Nov 2015 17:32:10 +0000 (17:32 +0000)]
Import translations. DO NOT MERGE
am:
984f7fb960 -s ours
* commit '
984f7fb9603b55d3031f7df04fa37010513b712c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:07:16 +0000 (18:07 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ief45ae89cfe3bfd76390f8f70276c2411d0dfc30
Auto-generated-cl: translation import
Matthew Williams [Fri, 16 Oct 2015 19:01:31 +0000 (12:01 -0700)]
Sync extras bundle comparison can throw NPE
BUG:
23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit
9ad2c8403354a985258c098681067e74b9e2f638)
Sebastien Hertz [Wed, 11 Nov 2015 01:02:21 +0000 (01:02 +0000)]
Allow debugging only for apps forked from zygote
am:
f915991842 -s ours
* commit '
f91599184200e4e5f5b8bb01f9e7274d21a3dc9d':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
(cherry picked from commit
ff8dc21278b19b22ed8dc9f9475850838336d351)
Jeff Sharkey [Mon, 9 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
am:
00765ef5a2
* commit '
00765ef5a2a0981d18a15f3acaf4119592d42996':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:40:29 +0000 (21:40 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
Marco Nelissen [Mon, 9 Nov 2015 21:28:32 +0000 (21:28 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am:
83702ec3ed
* commit '
83702ec3edf3bd17eff90a409cc3cf5efab48cff':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
Geoff Mendal [Mon, 9 Nov 2015 17:51:40 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 9 Nov 2015 17:43:57 +0000 (18:43 +0100)]
Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 17:27:25 +0000 (17:27 +0000)]
Import translations. DO NOT MERGE
am:
49eeda33dd -s ours
* commit '
49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:10:12 +0000 (18:10 +0100)]
Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:11:08 +0000 (05:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug:
18625739
Bug:
22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
Chris Elliott [Fri, 6 Nov 2015 18:36:16 +0000 (18:36 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am:
d9a2be8d3d -s ours
* commit '
d9a2be8d3d5bd0e170fec71c316373e268a8c17f':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 17:41:17 +0000 (17:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
This reverts commit
7e19e286cc990daaafe934ed82ddfa00762907d6.
Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
Jeff Sharkey [Fri, 6 Nov 2015 17:16:22 +0000 (09:16 -0800)]
Block directory selection in openable modes.
When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.
Bug:
25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e
Chris Craik [Thu, 5 Nov 2015 20:25:34 +0000 (20:25 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
am:
0cf48e9120
* commit '
0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:23:46 +0000 (20:23 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
am:
e10faaa410
* commit '
e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:21:45 +0000 (20:21 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
Jeff Sharkey [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
Tenghui Zhu [Thu, 5 Nov 2015 20:13:05 +0000 (20:13 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev
am:
76d20b4a5c
* commit '
76d20b4a5c6463235d9497b8018a38c059a6761c':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Thu, 5 Nov 2015 20:05:37 +0000 (20:05 +0000)]
Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev
Joe LaPenna [Thu, 5 Nov 2015 19:26:47 +0000 (11:26 -0800)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Also remove DEBUG-related timeout changes to have consistent behavior.
BUG:
24247417
BUG:
25463669
BUG:
23753686
Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2
Jeff Sharkey [Thu, 5 Nov 2015 18:00:05 +0000 (10:00 -0800)]
Kick movement preconditions onto handler thread.
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app. If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.
Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.
Bug:
25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
Chris Craik [Thu, 5 Nov 2015 17:58:28 +0000 (17:58 +0000)]
Revert "Remove -ffast-math from libhwui makefile"
This reverts commit
e02ec7c37a92fd63748a610bac6a23d0409788cf.
Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow
b/
25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
Riley Andrews [Wed, 4 Nov 2015 20:24:36 +0000 (20:24 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am:
c8bb39d98d
* commit '
c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
am:
10eb6ab94b
* commit '
10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:28:39 +0000 (19:28 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:27:19 +0000 (19:27 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
am:
c4aaf0f4b8
* commit '
c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:20:52 +0000 (19:20 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.
b/
24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit
8d0ec389531d071529fb0a800f10733b057205d9)
Chris Craik [Wed, 4 Nov 2015 18:12:28 +0000 (10:12 -0800)]
Remove -ffast-math from libhwui makefile
bug:
25417885
Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8e7ab07ce7 -s ours
* commit '
8e7ab07ce76c20da653e098adfe38da867753305':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am:
1e1fbd804b
* commit '
1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am:
4c9cdbc7ba -s ours
* commit '
4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"
Bug
25462107
This reverts commit
d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import