OSDN Git Service
Andrii Kulian [Fri, 21 Oct 2016 18:55:23 +0000 (11:55 -0700)]
Apply display override config for secondary displays
Now display-specific settings, such as dimensions and orientation,
are stored in display override config. For default display it is
mirroring the global config. Each time when global config is updated,
override of the default display should be updated too and vice versa.
Test: Existing and manual tests still pass.
Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
Mark Salyzyn [Mon, 24 Oct 2016 16:12:43 +0000 (16:12 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7 am:
9c0ea2d1cd am:
5aad37e70c
am:
5be5a41170
Change-Id: Ia7ee2481592d3df55c3fda94cc1abfb4ea4a95cc
Mark Salyzyn [Mon, 24 Oct 2016 16:06:03 +0000 (16:06 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7 am:
9c0ea2d1cd
am:
5aad37e70c
Change-Id: I63b9ad911207f535c358cfd422a9b2990254de95
Mark Salyzyn [Mon, 24 Oct 2016 15:59:34 +0000 (15:59 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7
am:
9c0ea2d1cd
Change-Id: I61d351dd5b83e598fd59efbe9f414166a685fef7
Mark Salyzyn [Mon, 24 Oct 2016 15:53:30 +0000 (15:53 +0000)]
Merge "PdfEditor: define LOG_TAG"
am:
a3bb8e3cc7
Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150
Treehugger Robot [Mon, 24 Oct 2016 15:47:32 +0000 (15:47 +0000)]
Merge "PdfEditor: define LOG_TAG"
TreeHugger Robot [Mon, 24 Oct 2016 14:45:42 +0000 (14:45 +0000)]
Merge changes I1a544a8d,Ie78d3fb0
* changes:
IpConnectivityMetrics: rate limit ApfProgramEvents
IpConnectivityMetrics reads buffer size in settings
Shigeki Yokomichi [Mon, 24 Oct 2016 14:42:31 +0000 (14:42 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284 am:
e79cb5c81d am:
77fc19fa8e
am:
1a1b16f300
Change-Id: Id3e9355cf77c3003b16797bcb5683908fa80d983
Shigeki Yokomichi [Mon, 24 Oct 2016 14:35:29 +0000 (14:35 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284 am:
e79cb5c81d
am:
77fc19fa8e
Change-Id: I477db42ff85d52c07f29b844d7d251ce631251cd
Shigeki Yokomichi [Mon, 24 Oct 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284
am:
e79cb5c81d
Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90
Shigeki Yokomichi [Mon, 24 Oct 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
am:
f741f88284
Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52
Treehugger Robot [Mon, 24 Oct 2016 14:09:35 +0000 (14:09 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
Hugo Benichi [Tue, 18 Oct 2016 01:36:33 +0000 (10:36 +0900)]
IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).
Test: new test in IpConnectivityMetricsTest
Bug:
1550402
Change-Id: I1a544a8d62e6b02f0ed0088ab76c4bad338d2f44
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug:
32198637
Change-Id: Ie78d3fb03cea7883585549dac4f2063f0a8d9f4b
Hugo Benichi [Mon, 24 Oct 2016 04:48:34 +0000 (04:48 +0000)]
Merge "TokenBucket for rate-limiting and throttling"
Shigeki Yokomichi [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Avoid to use the class variable on null possibility statement.
Bug:
32361138
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
Pankaj Kanwar [Mon, 24 Oct 2016 02:26:54 +0000 (02:26 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am:
9cac4568e5 am:
0d75ccf006
am:
7332192158
Change-Id: Ie87138ea99e89ede8aab72eec001a5397226548c
Lorenzo Colitti [Mon, 24 Oct 2016 02:25:50 +0000 (02:25 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility. am:
625166377b am:
c9f79b3d1e
am:
b9dc4cf958
Change-Id: Id3bc3a25d75e0a11fefaf55b027dbe6336873459
Pankaj Kanwar [Mon, 24 Oct 2016 02:20:20 +0000 (02:20 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am:
9cac4568e5
am:
0d75ccf006
Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010
Lorenzo Colitti [Mon, 24 Oct 2016 02:19:19 +0000 (02:19 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility. am:
625166377b
am:
c9f79b3d1e
Change-Id: I8430e6190e2c6170a00c6b8106416ca5801671db
Pankaj Kanwar [Mon, 24 Oct 2016 02:13:18 +0000 (02:13 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
am:
9cac4568e5
Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044
Lorenzo Colitti [Mon, 24 Oct 2016 02:13:15 +0000 (02:13 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility.
am:
625166377b
Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
Pankaj Kanwar [Mon, 24 Oct 2016 02:02:48 +0000 (02:02 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
Bill Yi [Sat, 22 Oct 2016 12:03:13 +0000 (12:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
496d17f748 -s ours am:
0f106f5744 -s ours
am:
28a2a4fe44 -s ours
Change-Id: I3a6b55feebc5c03861629eb035be7934375ddfd2
Bill Yi [Sat, 22 Oct 2016 12:02:17 +0000 (12:02 +0000)]
Import translations. DO NOT MERGE am:
300ad2e4b0 -s ours am:
adfb58ac37 -s ours
am:
5171c42190 -s ours
Change-Id: I325cb89ffb79257ff7236ce5c44b7ed53773c135
Bill Yi [Sat, 22 Oct 2016 11:58:52 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d849122bbb -s ours am:
e7bdd3679c -s ours
am:
492069d446 -s ours
Change-Id: I36933c0a24a9d79e628e00f6c5c3b0a8afad6c3a
Bill Yi [Sat, 22 Oct 2016 11:58:01 +0000 (11:58 +0000)]
Import translations. DO NOT MERGE am:
39eb3b4ac2 -s ours am:
28fbde286d -s ours
am:
2ba167ff2b -s ours
Change-Id: Ic2355247115c72dbaade8d20c11bc05524aaafdb
Bill Yi [Sat, 22 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
be30f0d5ea -s ours
am:
3501a750e5 -s ours
Change-Id: I73d837e4e9e13c5f96f12405e875a9ac26f469c7
Bill Yi [Sat, 22 Oct 2016 11:56:11 +0000 (11:56 +0000)]
Import translations. DO NOT MERGE am:
8758da732f -s ours
am:
d5deaa138e -s ours
Change-Id: I6514cbb9efae55ad520c4e51d3fbeff3b600b22b
Bill Yi [Sat, 22 Oct 2016 11:55:18 +0000 (11:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
496d17f748 -s ours
am:
0f106f5744 -s ours
Change-Id: Ibab00657197612ed30ac08888826e3a7e132f5ad
Bill Yi [Sat, 22 Oct 2016 11:55:12 +0000 (11:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0cb41b80af -s ours
am:
51650365a4 -s ours
Change-Id: If454b0069d943c2ed2af8a2410f83403e9cf6465
Bill Yi [Sat, 22 Oct 2016 11:54:15 +0000 (11:54 +0000)]
Import translations. DO NOT MERGE am:
300ad2e4b0 -s ours
am:
adfb58ac37 -s ours
Change-Id: I661ecca9565772febd4fb26027187de687d6e194
Bill Yi [Sat, 22 Oct 2016 11:54:14 +0000 (11:54 +0000)]
Import translations. DO NOT MERGE am:
c27fdce39f -s ours
am:
0e033e38cc -s ours
Change-Id: I55ca7034d0a22cd1122d20dfd5d0830e70b347ce
Bill Yi [Sat, 22 Oct 2016 11:49:18 +0000 (11:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d849122bbb -s ours
am:
e7bdd3679c -s ours
Change-Id: I0e7e7ccc36bb09246869c9eb7c4351ff44888458
Bill Yi [Sat, 22 Oct 2016 11:48:17 +0000 (11:48 +0000)]
Import translations. DO NOT MERGE am:
39eb3b4ac2 -s ours
am:
28fbde286d -s ours
Change-Id: Ib6de23cd75229a335ad8d318b6acc26d5c2da0b4
Bill Yi [Sat, 22 Oct 2016 11:47:00 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
be30f0d5ea -s ours
Change-Id: I9d5c804341cf0ced313b8a82db933975b1089775
Bill Yi [Sat, 22 Oct 2016 11:46:56 +0000 (11:46 +0000)]
Import translations. DO NOT MERGE
am:
8758da732f -s ours
Change-Id: I574899dc90e63b25b249c75dfde0e87c7b590621
Bill Yi [Sat, 22 Oct 2016 11:45:36 +0000 (11:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0cb41b80af -s ours
Change-Id: I9dd31230b3ee011d36e1324c4ab279cf30ef34c5
Bill Yi [Sat, 22 Oct 2016 11:45:32 +0000 (11:45 +0000)]
Import translations. DO NOT MERGE
am:
c27fdce39f -s ours
Change-Id: I0e59e72f0b24f846472adf0b20098fcd9ae4359a
Bill Yi [Sat, 22 Oct 2016 11:42:09 +0000 (11:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
496d17f748 -s ours
Change-Id: I3c4017b2b089fafacf6b6951ca62da054363827f
Bill Yi [Sat, 22 Oct 2016 11:42:07 +0000 (11:42 +0000)]
Import translations. DO NOT MERGE
am:
300ad2e4b0 -s ours
Change-Id: I6ecb8388aa2baa4733d75cee4628397e9d68e586
Bill Yi [Sat, 22 Oct 2016 11:40:52 +0000 (11:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d849122bbb -s ours
Change-Id: I8612211ea13a7f66963d2b378db3e5c3049a6c72
Bill Yi [Sat, 22 Oct 2016 11:40:50 +0000 (11:40 +0000)]
Import translations. DO NOT MERGE
am:
39eb3b4ac2 -s ours
Change-Id: If06e606ce2c9ad83c680154bc7e5a8bd80af5207
TreeHugger Robot [Sat, 22 Oct 2016 11:36:41 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:35:33 +0000 (11:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:34:14 +0000 (11:34 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 22 Oct 2016 11:33:37 +0000 (11:33 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 22 Oct 2016 11:33:13 +0000 (11:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:32:49 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Paulo Casanova [Sat, 22 Oct 2016 08:19:16 +0000 (08:19 +0000)]
Merge "Added JNI interface for aapt2."
Bill Yi [Sat, 22 Oct 2016 08:11:45 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia238fb87c9c8be76cbadfbec1956b629414a3c48
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 07:52:51 +0000 (00:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d5eae9008ead575fda0db5acbd233b4a9cf7273
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 07:39:33 +0000 (00:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea19370bd97ac3bfaf398bd773b8f706461a6921
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 06:40:55 +0000 (23:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea8977a449dd44d2bdbc0481a421606d5dfc3047
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 22 Oct 2016 06:28:42 +0000 (06:28 +0000)]
Merge "Add one more CategoryKey."
Julius D'souza [Sat, 22 Oct 2016 04:17:28 +0000 (04:17 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev am:
e2590cccfd
am:
8c288cd77b -s ours
Change-Id: Ic3d810fc1b13a0d896b7600329d2b925a5d76150
Julius D'souza [Sat, 22 Oct 2016 04:14:22 +0000 (04:14 +0000)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples am:
a2b07dc8d9
am:
df09aa2135 -s ours
Change-Id: I03ed28868fc2965352e2fb68996a0e8fa81f47fd
Julius D'souza [Sat, 22 Oct 2016 04:13:23 +0000 (04:13 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev am:
e88cbbf40d
am:
af9361f565 -s ours
Change-Id: I06dca83d8bee11d0f8ad64770f7bff2e78ff40a9
Julius D'souza [Sat, 22 Oct 2016 04:12:20 +0000 (04:12 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" am:
4fff94f1ed
am:
5f55007bc2 -s ours
Change-Id: I14131de322a6ff87369c01372531c30812ec22ed
Julius D'souza [Sat, 22 Oct 2016 04:05:59 +0000 (04:05 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
am:
e2590cccfd
Change-Id: I887432053d2503cf542ad3106ab915a0d4f3998f
Julius D'souza [Sat, 22 Oct 2016 04:05:52 +0000 (04:05 +0000)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
am:
a2b07dc8d9
Change-Id: I1cc70bcb8dc946ab72f1ce5dd0b126d613d90d44
Julius D'souza [Sat, 22 Oct 2016 04:04:28 +0000 (04:04 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
am:
e88cbbf40d
Change-Id: I82350ac6ce99890d30542b7616dac8579eed0413
Julius D'souza [Sat, 22 Oct 2016 04:04:22 +0000 (04:04 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
am:
4fff94f1ed
Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc
Julius D'souza [Sat, 22 Oct 2016 03:58:25 +0000 (03:58 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
Julius D'souza [Sat, 22 Oct 2016 03:57:59 +0000 (03:57 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
Robert Sesek [Sat, 22 Oct 2016 03:22:50 +0000 (03:22 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546 am:
f80fab010a
am:
aa544e975e
Change-Id: I561fff0f56bdbfdeb6c92c11c3fce12cf3fe28be
Robert Sesek [Sat, 22 Oct 2016 03:17:15 +0000 (03:17 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546
am:
f80fab010a
Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
Robert Sesek [Sat, 22 Oct 2016 03:12:18 +0000 (03:12 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am:
8be2850546
Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
Treehugger Robot [Sat, 22 Oct 2016 03:03:10 +0000 (03:03 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
Bill Yi [Sat, 22 Oct 2016 02:45:18 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7564aa066446c6332e6cca5868905a8f05850fcc
Auto-generated-cl: translation import
Jason Monk [Sat, 22 Oct 2016 02:42:15 +0000 (02:42 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49 am:
e28705ac90
am:
7a12d75543
Change-Id: I293607cff0a3bab8653eeadf10a7c70da86656eb
Jason Monk [Sat, 22 Oct 2016 02:41:21 +0000 (02:41 +0000)]
Fix vpn branded string usage am:
59474a40af am:
ec421cd433
am:
7eef409c52
Change-Id: If1cefaf23db55037b421e5629a44ebf4c742cf4b
Jason Monk [Sat, 22 Oct 2016 02:37:21 +0000 (02:37 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49
am:
e28705ac90
Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78
Bill Yi [Sat, 22 Oct 2016 02:37:08 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c1c1777ee5b308a1632fe4dc6973d94378e55fe
Auto-generated-cl: translation import
Jason Monk [Sat, 22 Oct 2016 02:36:16 +0000 (02:36 +0000)]
Fix vpn branded string usage am:
59474a40af
am:
ec421cd433
Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
Jason Monk [Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
am:
9db47b0f49
Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
Jason Monk [Sat, 22 Oct 2016 02:30:51 +0000 (02:30 +0000)]
Fix vpn branded string usage
am:
59474a40af
Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
Julius D'souza [Sat, 22 Oct 2016 02:16:47 +0000 (19:16 -0700)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
Bug:
32169300
Change-Id: If7eb443bc7c4bcc21eb4bc317f4fcd1219e9e25b
Julius D'souza [Sat, 22 Oct 2016 02:21:01 +0000 (02:21 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
This reverts commit
637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.
Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
TreeHugger Robot [Sat, 22 Oct 2016 01:22:32 +0000 (01:22 +0000)]
Merge "Use VR hal in VrManagerService."
TreeHugger Robot [Sat, 22 Oct 2016 00:37:16 +0000 (00:37 +0000)]
Merge "AAPT2: Ensure string pool ordering is compact"
Jeremy Joslin [Fri, 21 Oct 2016 23:47:35 +0000 (23:47 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8 am:
0d309b7a47
am:
807102d7ff
Change-Id: I1edec6bf2a590f5b0ff010adfd6f2785a1aaa994
Jeremy Joslin [Fri, 21 Oct 2016 23:43:06 +0000 (23:43 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8
am:
0d309b7a47
Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
Jeremy Joslin [Fri, 21 Oct 2016 23:37:57 +0000 (23:37 +0000)]
VPN network stat accounting changes.
am:
3f0d75afe8
Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
Fan Zhang [Fri, 21 Oct 2016 23:35:39 +0000 (16:35 -0700)]
Add one more CategoryKey.
This is used in secondary setting page: App & Notification > AppDefaults
Bug:
31799948
Test: manual
Change-Id: Icc8fa15352006034743c17d2ee943c05a21f612f
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes:
32071681
Julius D'souza [Fri, 21 Oct 2016 22:43:16 +0000 (22:43 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev am:
a39e64eac2
am:
38405b69d2 -s ours
Change-Id: I85c746508e10e7b7b739587b7d9fce081d53ecca
Julius D'souza [Fri, 21 Oct 2016 22:42:09 +0000 (22:42 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze am:
637ae798cc
am:
0085ce0513 -s ours
Change-Id: Ibded7dd4f59a18ef3268d7c5f19074679392d234
Julius D'souza [Fri, 21 Oct 2016 22:37:04 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am:
a39e64eac2
Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
Julius D'souza [Fri, 21 Oct 2016 22:36:58 +0000 (22:36 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
am:
637ae798cc
Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d
Joe Onorato [Fri, 21 Oct 2016 22:32:32 +0000 (22:32 +0000)]
Merge "Another mac fix"
Joe Onorato [Fri, 21 Oct 2016 22:18:18 +0000 (15:18 -0700)]
Another mac fix
Test: make (on linux)
Change-Id: I3f0561f3a1fc08dad5d3dd8ba860da56b51d273c
Julius D'souza [Fri, 21 Oct 2016 22:29:33 +0000 (22:29 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
Julius D'souza [Fri, 21 Oct 2016 21:06:28 +0000 (14:06 -0700)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
Bug:
32169300
Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
Christopher Ferris [Fri, 21 Oct 2016 22:22:59 +0000 (22:22 +0000)]
Merge "Fix mac build."
Siyamed Sinir [Fri, 21 Oct 2016 21:51:13 +0000 (21:51 +0000)]
Merge "Update TextView (set|get)(min|max)(width|height) ApiDoc"
Joe Onorato [Fri, 21 Oct 2016 21:35:40 +0000 (21:35 +0000)]
Merge "Fix mac build of bit"
Joe Onorato [Fri, 21 Oct 2016 21:31:42 +0000 (14:31 -0700)]
Fix mac build of bit
Test: make bit
Change-Id: I8005e77babfbe2d48806f9315800e699d1917bb4
Yin-Chia Yeh [Fri, 21 Oct 2016 21:28:30 +0000 (21:28 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
am:
2979f63cd9
Change-Id: I20d62c7fa14424a208901c41e9eefe8c50f5b662
OSDN Git Service
