Commit Graph

267084 Commits

Author SHA1 Message Date
Phil Weaver
eba594fa1b Merge \\\"Revert \\\"Improve accessibility window title behavior\\\"\\\" into nyc-dev am: fc71309640 am: 2c8099110e
am: d06094dd86

Change-Id: I9da39b5bbd28592f7babe17f3aff4142e04f2e47
2016-06-08 02:31:16 +00:00
Phil Weaver
d06094dd86 Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am: fc71309640
am: 2c8099110e

Change-Id: Id615a721b788760b54754355414fe9762d65f0ab
2016-06-08 02:27:41 +00:00
Phil Weaver
2c8099110e Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: Ia2728037f9e610dd49db2bd1a22fd72690bd5340
2016-06-08 02:24:47 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
TreeHugger Robot
0f1d727e45 Merge "Fix up issues in PdfRenderer found by test." 2016-06-08 01:56:04 +00:00
Chong Zhang
38bf9febb3 Merge \"Merge \\\"Check if task was top of stack before it\\\'s removed\\\" into nyc-dev am: 94b4029f03 am: cfefb2b85c\" into nyc-mr1-dev-plus-aosp
am: e7135f6128

Change-Id: I4bf63c74ce91f3d4890c9a2b9f03588d624f7d73
2016-06-08 01:36:15 +00:00
Chong Zhang
5cf7f0cb96 Merge \\\"Check if task was top of stack before it\\\'s removed\\\" into nyc-dev am: 94b4029f03 am: b6e31cef99
am: b8f03ad821

Change-Id: Ie430760204d499ef8eb28e08a748f84994722b2e
2016-06-08 01:36:10 +00:00
Chong Zhang
8ce1bca0ad Merge \\"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa9e\\" into nyc-mr1-dev am: 22eaf715a1
am: 2ae1144d7e

Change-Id: I67e669ea32d3bbe9320c32653cc460fa73d317a8
2016-06-08 01:36:04 +00:00
Android Build Merger (Role)
e7135f6128 Merge "Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am: 94b4029f03 am: cfefb2b85c" into nyc-mr1-dev-plus-aosp 2016-06-08 01:32:23 +00:00
Chong Zhang
344beab94b Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am: 94b4029f03
am: cfefb2b85c

Change-Id: I3550515c849ebe48051c33c9e42fc032be0cd49d
2016-06-08 01:31:57 +00:00
Chong Zhang
25007ec4df Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa9e am: 1895addcef\" into nyc-mr1-dev-plus-aosp
am: c6a520e090

Change-Id: If5550e5db119b201228c391e049d54f3760cca31
2016-06-08 01:31:18 +00:00
Felipe Leme
61da879b9c Merge \\"Added a getPrimaryStorageSize() method.\\" into nyc-mr1-dev am: ba3676460a
am: 02e2d72d55

Change-Id: I71a1554683697b5b6dde0c47bc2a4464b56b691b
2016-06-08 01:31:14 +00:00
Felipe Leme
5403ed3296 Merge \\\"Duplicate file descriptor when dumping asynchronously.\\\" into nyc-dev am: c02ba17898 am: 53c1637134
am: 2e335cd9a4

Change-Id: Id85c9edefae59cfcc671c4a867c44c1a9c672212
2016-06-08 01:31:11 +00:00
Chong Zhang
b8f03ad821 Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am: 94b4029f03
am: b6e31cef99

Change-Id: Ifeaa9d372efc5bf11f4346cb4810bf913c61f7cc
2016-06-08 01:31:05 +00:00
Chong Zhang
2ae1144d7e Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e\" into nyc-mr1-dev
am: 22eaf715a1

Change-Id: I657487ecab8b23a002e32072bca17d21e627a804
2016-06-08 01:31:01 +00:00
Android Build Merger (Role)
c6a520e090 Merge "Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e am: 1895addcef" into nyc-mr1-dev-plus-aosp 2016-06-08 01:27:45 +00:00
Chong Zhang
456fc8cd3c Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e
am: 1895addcef

Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
2016-06-08 01:27:16 +00:00
Jan Nordqvist
eaf9eebb31 Merge "Fixed binding issue. Updating cert and key for EAP-TLS during remediation. Fixed WNM remediation logic." 2016-06-08 01:26:50 +00:00
Chong Zhang
b6e31cef99 Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I58b62cd4b61952e82b2e2e6951b0f3a40511a340
2016-06-08 01:26:27 +00:00
Felipe Leme
52c6239369 Merge \\\"Duplicate file descriptor when dumping asynchronously.\\\" into nyc-dev am: c02ba17898 am: 9d178342d8
am: 3b37c224b5

Change-Id: Icea29e406cc99266f6b1c26a6cd850de56c25ae0
2016-06-08 01:26:14 +00:00
Chong Zhang
cfefb2b85c Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I001916c3c02c016b6240ecb8b16bc545887abefe
2016-06-08 01:26:10 +00:00
Felipe Leme
02e2d72d55 Merge \"Added a getPrimaryStorageSize() method.\" into nyc-mr1-dev
am: ba3676460a

Change-Id: Ibabc9b60735422360fe770eb7ba57c70532f22c4
2016-06-08 01:25:34 +00:00
Felipe Leme
2e335cd9a4 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898
am: 53c1637134

Change-Id: Ic53a1fd625879f75b8ff541c0a91336fcaea288b
2016-06-08 01:25:30 +00:00
Android Build Merger (Role)
22eaf715a1 Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev 2016-06-08 01:23:04 +00:00
Chong Zhang
5c689127ba Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
2016-06-08 01:22:43 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Felipe Leme
3b37c224b5 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898
am: 9d178342d8

Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
2016-06-08 01:21:57 +00:00
Chong Zhang
1895addcef Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
2016-06-08 01:19:03 +00:00
Chong Zhang
1c850c7451 Merge \"Merge \\\"Set fontScale in override config to be equal to global.\\\" into nyc-dev am: c9adac6abb am: c4d9ea8551\" into nyc-mr1-dev-plus-aosp
am: eebd5b2a57

Change-Id: I651fe1bb8c1a7143b8d80bcf8469227c8877c71c
2016-06-08 01:18:59 +00:00
Chong Zhang
94b4029f03 Merge "Check if task was top of stack before it's removed" into nyc-dev 2016-06-08 01:18:01 +00:00
Felipe Leme
53c1637134 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
2016-06-08 01:15:06 +00:00
Felipe Leme
9d178342d8 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
2016-06-08 01:13:55 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
Chong Zhang
746bb932a3 Merge \\\"Set fontScale in override config to be equal to global.\\\" into nyc-dev am: c9adac6abb am: 01a3095f5f
am: fa1c59ca17

Change-Id: Ic77fbe4be6c51a4e69e5f157f880bc58ee179e4c
2016-06-08 01:11:50 +00:00
Android Build Merger (Role)
eebd5b2a57 Merge "Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb am: c4d9ea8551" into nyc-mr1-dev-plus-aosp 2016-06-08 01:08:43 +00:00
TreeHugger Robot
c02ba17898 Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev 2016-06-08 01:08:42 +00:00
Chong Zhang
2e2e655238 Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb
am: c4d9ea8551

Change-Id: I7e59243cd1535fd4c6f55de0f13021036d838918
2016-06-08 01:08:14 +00:00
Chong Zhang
fa1c59ca17 Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb
am: 01a3095f5f

Change-Id: I99b830777ca94e095c2d6796681d7aec08ad4d41
2016-06-08 01:08:09 +00:00
Chong Zhang
01a3095f5f Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: I0291db79581d143cabf5f6bbf8a727c2b8c06df6
2016-06-08 01:04:16 +00:00
Chong Zhang
c4d9ea8551 Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: If62da650207267872815af6f7e793b193e23d10e
2016-06-08 01:04:12 +00:00
Siyamed Sinir
d49e9c16df Merge \\\"Fix int overflow in SpannableStringBuilder.replace\\\" into nyc-dev am: 96c3e5504b am: df3d144b17
am: 3d077daaac

Change-Id: I83d2075dc1d66380b41865299f2788fb17d260e7
2016-06-08 01:03:12 +00:00
Jan Nordqvist
620c920579 Fixed binding issue.
Updating cert and key for EAP-TLS during remediation.
Fixed WNM remediation logic.

Bug=28885285
Bug=27485600
Bug=27485524

Change-Id: I1272d8d004a8fd9853f80e951531c0b67ddf34e3
2016-06-08 01:02:10 +00:00
Android Build Merger (Role)
4c4d76a9bd Merge "Merge \\\"Fix int overflow in SpannableStringBuilder.replace\\\" into nyc-dev am: 96c3e5504b am: 9eddf7ae8e am: bb05c332b1" 2016-06-08 01:00:44 +00:00
Android Build Merger (Role)
bf5ecae707 Merge "Merge \"Merge \\\"Frameworks/base: Fix FastPrintWriter infinite loop\\\" into nyc-dev am: c82a2b5358 am: 66c2bfcede\" into nyc-mr1-dev-plus-aosp am: ef5ce09ad4" 2016-06-08 01:00:35 +00:00
Jan Nordqvist
3198f1a341 Merge "FlowService turned into separate process. Introduced new much improved remediation handler. Current incomplete code check-in. Changing package name to osu. Much improved and separated flow process. Adding in-process web-view." 2016-06-08 01:00:25 +00:00
Siyamed Sinir
a4cbaa30e1 Merge \\\"Fix int overflow in SpannableStringBuilder.replace\\\" into nyc-dev am: 96c3e5504b am: 9eddf7ae8e
am: bb05c332b1

Change-Id: I3ff5cb7dbf6ceccf212d65fcb8b06eb5c087cc5e
2016-06-08 00:59:49 +00:00
Andreas Gampe
aab469dfcd Merge \"Merge \\\"Frameworks/base: Fix FastPrintWriter infinite loop\\\" into nyc-dev am: c82a2b5358 am: 66c2bfcede\" into nyc-mr1-dev-plus-aosp
am: ef5ce09ad4

Change-Id: I868ffd090cac1b72f79506d0da6daf38cfde2658
2016-06-08 00:59:46 +00:00
Chong Zhang
c9adac6abb Merge "Set fontScale in override config to be equal to global." into nyc-dev 2016-06-08 00:59:44 +00:00
Siyamed Sinir
3d077daaac Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am: 96c3e5504b
am: df3d144b17

Change-Id: I50d759b3865fe66e23f5bc82199c9b512a3489c1
2016-06-08 00:59:44 +00:00
Andreas Gampe
f55d83b537 Merge \\\"Frameworks/base: Fix FastPrintWriter infinite loop\\\" into nyc-dev am: c82a2b5358 am: 89b7934905
am: a2fe97ffa4

Change-Id: Ib3aaf7cd081cbd3e4361e9328c880fa59838b0b4
2016-06-08 00:59:44 +00:00