OSDN Git Service
Michael Kwan [Tue, 17 Nov 2015 00:06:28 +0000 (00:06 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours
am:
b0aae584ea -s ours
* commit '
b0aae584ea2a5649ac113ba05c88cbbe6616709e':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:57:47 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours
am:
f23229f45f -s ours
* commit '
f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:48:39 +0000 (23:48 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
am:
8d6630b87c -s ours
* commit '
8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
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
Rom Lemarchand [Mon, 16 Nov 2015 21:33:48 +0000 (21:33 +0000)]
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
resolved conflicts for
7de7e0b0 to stage-aosp-master
BatteryService: Add Max charging voltage
Stop setting swappiness.
Eino-Ville Talvala [Mon, 16 Nov 2015 20:44:44 +0000 (20:44 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c am:
784f0f15a9
am:
c24b39e0c0
* commit '
c24b39e0c0f760ac6a53d4fbbf1ed1885fd64529':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:35:48 +0000 (20:35 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c
am:
784f0f15a9
* commit '
784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:27:03 +0000 (20:27 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759
am:
062c629e5c
* commit '
062c629e5c6270da232bbd2800966ab5dc6c615f':
Camera: Minor documentation update
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 [Mon, 16 Nov 2015 19:12:17 +0000 (19:12 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9 am:
b45defae8e
am:
529893f84c
* commit '
529893f84cc62893ad6111816954b0bc7c829cee':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 19:03:52 +0000 (19:03 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471 am:
211abad3b9
am:
b45defae8e
* commit '
b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG:
25165471
Erik Wolsheimer [Mon, 16 Nov 2015 18:55:29 +0000 (18:55 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471
am:
211abad3b9
* commit '
211abad3b92b70dd094949c79f67e686c940fa0c':
Log errno when dup fd cannot be allocated BUG:
25165471
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
(cherry picked from commit
9f8602644418ecfb1a5c9555792ceed285fa72bd)
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Badhri Jagan Sridharan [Tue, 27 Oct 2015 20:59:34 +0000 (13:59 -0700)]
BatteryService: Add Max charging voltage
Bug:
25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit
f92fcfe36ad841cba4774e7f2129e8dab7ac784a)
Martijn Coenen [Mon, 2 Nov 2015 16:07:56 +0000 (17:07 +0100)]
Stop setting swappiness.
We're re-enabling memory cgroups on Ariel
to use user-space lmkd. As a side-effect, this
code will start setting swappiness again. Since the
benefit of swappiness is unknown at this point
(see b/
18248535 for details), disable it until
we have good data it helps.
Change-Id: I8e8b892ba0db27469f2d47615f71ce1d2712acbf
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 17:39:29 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 16 Nov 2015 17:31:23 +0000 (18:31 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ie5a78ca8aadcfd06937b3c917e9d7c99cdc1da0c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 17:22:23 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
f34cefdc2d -s ours
* commit '
f34cefdc2d7d2e1b702a5af8f31bdebba455f81d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 16 Nov 2015 17:16:28 +0000 (18:16 +0100)]
Import translations. DO NOT MERGE
Change-Id: I1d71c3b6382fb097a4c33f0210138537b48215f0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 14:10:31 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours
am:
4510d17575 -s ours
* commit '
4510d175753dc4439411b19963cb4bd8bde2c2f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:54:50 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours
am:
a6c50551cd -s ours
* commit '
a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:38:58 +0000 (13:38 +0000)]
Import translations. DO NOT MERGE
am:
83d65fea01 -s ours
* commit '
83d65fea01c4233c80161acdd69b64fa559c3749':
Import translations. DO NOT MERGE
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:44:29 +0000 (18:44 +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
am:
28fc76ecef
* commit '
28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
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:21:53 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894
am:
1b29fd87a2
* commit '
1b29fd87a26d6230c55c701d1411b34342614af0':
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:20:05 +0000 (17:20 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
am:
fe482e0bca
* commit '
fe482e0bcabb98d983ecb4080b35490b9814c809':
Initialize DisplayContent base info when object is constructed
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:48:52 +0000 (02:48 +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
am:
d80d24f5b1
* commit '
d80d24f5b13c16ce19369b1debb9137516f59e3f':
Sync extras bundle comparison can throw NPE
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
Matthew Williams [Fri, 13 Nov 2015 02:29:50 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74 am:
c455148edc am:
af5c9f809c am:
69ee300c90
am:
ffffcf14c5
* commit '
ffffcf14c58f9795bda802d75308332d0bb49dfe':
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 [Fri, 13 Nov 2015 00:07:47 +0000 (00:07 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am:
5b6ad87630
am:
4f822bbf2a
* commit '
4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
Don't allow contact sharing by default for device not recognized as carkit.
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:14:29 +0000 (23:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
am:
516ac154e1 -s ours
* commit '
516ac154e16324d178fc1343293c4b1d5447ef2c':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Joe LaPenna [Thu, 12 Nov 2015 23:13:01 +0000 (23:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am:
6915d809e8 -s ours
* commit '
6915d809e895d29411c0a687bff7fdd391509dc7':
DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
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
Deepanshu Gupta [Wed, 21 Oct 2015 00:29:44 +0000 (17:29 -0700)]
Improve error reporting on Exceptions in fw views.
When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.
Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).
Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
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:25:02 +0000 (01:25 +0000)]
Camera: Documentation updates am:
d8407271ff am:
37e78cf8f1
am:
0e57a4d021
* commit '
0e57a4d02199a55db763b10a49f383c395e768c7':
Camera: Documentation updates
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:28:10 +0000 (23:28 +0000)]
Merge "ActivityView gets its own thread pool." into cw-e-dev
am:
1090acc958
* commit '
1090acc958add85c1332fc73b66258ea4efba69e':
ActivityView gets its own thread pool.
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:54:42 +0000 (21:54 +0000)]
Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am:
88d4cc1001
am:
4f22c781b6
* commit '
4f22c781b614322fe3790d314a527ac10471a63a':
Revert "Fix race condition when setting default ringtones"
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 18:03:38 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
efa66ca345 -s ours
* commit '
efa66ca345bc9c82e9f4c88e4e902f935804ab73':
Import translations. DO NOT MERGE
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 (17:41 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours
am:
adaccf62be -s ours
* commit '
adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
Import translations. DO NOT MERGE
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:11:33 +0000 (01:11 +0000)]
Allow debugging only for apps forked from zygote am:
f915991842 -s ours
am:
48fdfa403e
* commit '
48fdfa403eef469ea9bbcbf5509d919b7db447c7':
Allow debugging only for apps forked from zygote
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:53:02 +0000 (21:53 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am:
00765ef5a2
am:
e6538dcc06
* commit '
e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
Block directory selection in openable modes.
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:34:14 +0000 (21:34 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am:
83702ec3ed
am:
02bf433f90
* commit '
02bf433f902aa34483aa2fc1b410f393b35058f1':
Fix race condition when setting default ringtones
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