OSDN Git Service
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"
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"
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: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 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: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: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: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
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
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: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: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
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
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: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
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
Android Build Merger (Role) [Fri, 21 Oct 2016 21:19:31 +0000 (21:19 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Fri, 21 Oct 2016 21:18:48 +0000 (21:18 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41
am:
50f9b6e71f
Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
Vinod Krishnan [Fri, 21 Oct 2016 21:17:48 +0000 (21:17 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
am:
088f73a9e9
Change-Id: Icbea8fbdefbf9979b72b7babac10e28a336d7d2f
Vinod Krishnan [Fri, 21 Oct 2016 21:14:19 +0000 (21:14 +0000)]
Fwk: Only chime when docked and accessbility is on
am:
cf11ceab65
Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
Michael Kwan [Fri, 21 Oct 2016 21:11:25 +0000 (21:11 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
am:
243e966892
Change-Id: I9f3ae90d6ecce4c2944faad3f6f9b95642469935
Michael Kwan [Fri, 21 Oct 2016 21:11:17 +0000 (21:11 +0000)]
Fix improperly laid out alert dialog title to match UX specs.
am:
9c86e68bfa
Change-Id: I0989366635ebeb4af6ca63cc42c50913c2b7d32a
Yin-Chia Yeh [Fri, 21 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
am:
03f14bef41
Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
TreeHugger Robot [Fri, 21 Oct 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
Michael Kwan [Fri, 21 Oct 2016 20:38:02 +0000 (20:38 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
Treehugger Robot [Fri, 21 Oct 2016 20:36:29 +0000 (20:36 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
Mark Salyzyn [Fri, 7 Oct 2016 19:13:43 +0000 (12:13 -0700)]
PdfEditor: define LOG_TAG
general cleanup of logging
Test: compile
Bug:
31992412
Change-Id: Ie2ec5a223bbb92e902bf6914100281b6d84500e3
Yin-Chia Yeh [Wed, 19 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Camera2 Legacy: catch more surface abandoned error
Bug:
30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
Erik Wolsheimer [Fri, 21 Oct 2016 17:37:05 +0000 (17:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am:
653b982d18 -s ours
Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d
Erik Wolsheimer [Fri, 21 Oct 2016 17:36:58 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
am:
b608d28f84 -s ours
Change-Id: Ic3d70afc2f07ee8ae3e09fbb0e010daebb199f21
Mathieu Chartier [Fri, 21 Oct 2016 17:28:55 +0000 (17:28 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1
am:
bb08c03048
Change-Id: I24dc9ea087f76ebb2130a4d4957f0600e189aed3
Vinod Krishnan [Fri, 21 Oct 2016 05:57:02 +0000 (22:57 -0700)]
Fwk: Only chime when docked and accessbility is on
Bug:
32036947
Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
TreeHugger Robot [Fri, 21 Oct 2016 17:23:42 +0000 (17:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
Mathieu Chartier [Fri, 21 Oct 2016 17:20:27 +0000 (17:20 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
am:
4a5789b9b1
Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
Mathieu Chartier [Fri, 21 Oct 2016 17:07:37 +0000 (17:07 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
BUG:
32172459
BUG:
32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
Lorenzo Colitti [Fri, 21 Oct 2016 09:41:25 +0000 (18:41 +0900)]
CaptivePortalLogin: set mixed content policy to compatibility.
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.
Bug:
32171569
Change-Id: Ic8bc1440f1f26898ddbc0984fd1ddd2155c9588b
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
Jakub Adamek [Fri, 21 Oct 2016 09:27:35 +0000 (09:27 +0000)]
Add new color: accent with 60% opacity.
am:
4f8b640bb7
Change-Id: I59d23f030b6413f5cf3899d4a6b0daea7ff271c7
Jakub Adamek [Thu, 20 Oct 2016 08:45:38 +0000 (09:45 +0100)]
Add new color: accent with 60% opacity.
Bug:
32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
Jakub Adámek [Fri, 21 Oct 2016 07:58:34 +0000 (07:58 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
am:
42f40b159f
Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b
Jakub Adamek [Fri, 21 Oct 2016 07:58:26 +0000 (07:58 +0000)]
Fix idmap calls when a subdir is present.
am:
56b9987ed7
Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0
Jakub Adámek [Fri, 21 Oct 2016 07:51:17 +0000 (07:51 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
Jakub Adamek [Thu, 20 Oct 2016 14:07:57 +0000 (15:07 +0100)]
Fix idmap calls when a subdir is present.
We need to increase the size of argv so that the last one remains
a NULL.
Bug:
32202741
Change-Id: I6636b5401fa7a61686a48c9a99b3e54e596033f9
Flavio Lerda [Fri, 21 Oct 2016 07:09:27 +0000 (07:09 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
am:
327dbfb94f
Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64
Jakub Adamek [Fri, 21 Oct 2016 07:05:17 +0000 (07:05 +0000)]
Change name of overlay subdir 'sku'->'theme'
am:
54dcaaba4f
Change-Id: I4536de644c20171e175cddaff0cd041fb05b3038
Flavio Lerda [Fri, 21 Oct 2016 06:32:18 +0000 (06:32 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
liulvping [Fri, 21 Oct 2016 04:46:50 +0000 (04:46 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938
am:
0046acc2db
Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
Brad Ebinger [Fri, 21 Oct 2016 04:45:47 +0000 (04:45 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours
am:
ce21e3ffa8
Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790
liulvping [Fri, 21 Oct 2016 04:38:38 +0000 (04:38 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am:
e6fe836938
Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
Brad Ebinger [Fri, 21 Oct 2016 04:37:28 +0000 (04:37 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
am:
37521b9ba5 -s ours
Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
Brad Ebinger [Fri, 21 Oct 2016 04:37:22 +0000 (04:37 +0000)]
Switch on android.telecom.Log in Telecom
am:
ce97bfbdb2
Change-Id: Ic7827f1627eca43937609e21d15186f483381182
Treehugger Robot [Fri, 21 Oct 2016 03:50:15 +0000 (03:50 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
liulvping [Thu, 20 Oct 2016 11:51:38 +0000 (19:51 +0800)]
fix mistaken check of mScreenBrightnessDarkConfig
Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
Michael Kwan [Fri, 21 Oct 2016 01:36:09 +0000 (18:36 -0700)]
Fix improperly laid out alert dialog title to match UX specs.
Test: visual inspect using ApiDemos
Bug:
32315229
Change-Id: I486edc94c077af49e1235519e158e55833796231
Brad Ebinger [Wed, 5 Oct 2016 22:47:28 +0000 (15:47 -0700)]
Switch on android.telecom.Log in Telecom
Move over the Runnable Class into android.telecom and turn on the
framework's usage in Telecom.
CP from: https://android-review.googlesource.com/#/c/287291/
Test: All Telecom unit tests pass. Manual Log testing has also been
confirmed to be working as it did before.
Bug:
26571395
Change-Id: If7e2036c746c5a953f3a77e2d625a423ce5bf8f3
(cherry picked from commit
9fbbd4052dee1dfa74b87502cec91cc51170d69d)
Jacky Cheung [Thu, 20 Oct 2016 23:11:51 +0000 (23:11 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." am:
6071abdb92
am:
046a5c3a00
Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
Jacky Cheung [Thu, 20 Oct 2016 23:03:57 +0000 (23:03 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
am:
6071abdb92
Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
Brad Ebinger [Thu, 20 Oct 2016 22:53:38 +0000 (22:53 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
OSDN Git Service
