OSDN Git Service
Clara Bayarri [Thu, 23 Jun 2016 10:08:55 +0000 (11:08 +0100)]
Improve Exception message for adding private fragments
State which fragment is the culprit
Bug:
29565251
Change-Id: If571488882e495c09344bb06376346b3ae8dff16
Lorenzo Colitti [Thu, 23 Jun 2016 08:32:15 +0000 (08:32 +0000)]
Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am:
7aac630f8e am:
5719a7f478
am:
1767dd1af7
Change-Id: I276bd8cafdc0985f1e5ce4a40ed253e8dc93ce2d
Lorenzo Colitti [Thu, 23 Jun 2016 08:32:13 +0000 (08:32 +0000)]
Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am:
7aac630f8e am:
affc4c1347
am:
44e6ac0c40
Change-Id: I4bea027753bd0c9564a6d5b52440ab223864b3a0
Lorenzo Colitti [Thu, 23 Jun 2016 08:28:20 +0000 (08:28 +0000)]
Merge \\"Don\\'t loop forever on 0-length options.\\" into nyc-dev am:
7aac630f8e
am:
5719a7f478
Change-Id: I6817f8f9c7a83400a710144a8b57b6303082201f
Lorenzo Colitti [Thu, 23 Jun 2016 08:24:12 +0000 (08:24 +0000)]
Merge \\"Don\\'t loop forever on 0-length options.\\" into nyc-dev am:
7aac630f8e
am:
affc4c1347
Change-Id: Icedd33aa2cb5a4a76e2ab7a0be2a2051a40b8624
Lorenzo Colitti [Thu, 23 Jun 2016 08:23:18 +0000 (08:23 +0000)]
Merge \"Don\'t loop forever on 0-length options.\" into nyc-dev
am:
7aac630f8e
Change-Id: Icd3c0265ffb30232642f581a7c0031ed55ee6d21
Lorenzo Colitti [Thu, 23 Jun 2016 08:18:03 +0000 (08:18 +0000)]
Merge \"Don\'t loop forever on 0-length options.\" into nyc-dev
am:
7aac630f8e
Change-Id: I188441196255ffe132adef00728502101199756b
TreeHugger Robot [Thu, 23 Jun 2016 08:10:16 +0000 (08:10 +0000)]
Merge "Don't loop forever on 0-length options." into nyc-dev
Lorenzo Colitti [Thu, 23 Jun 2016 06:24:46 +0000 (15:24 +0900)]
Don't loop forever on 0-length options.
A malformed RA could cause the Ra constructor in ApfFilter to
enter an infinite loop while holding the class lock. This blocks
IpManager until reboot and drains the battery.
Bug:
29586253
Change-Id: Idaa46b3bc50371db076630881883807c2fa21674
Peng Xu [Thu, 23 Jun 2016 03:50:56 +0000 (03:50 +0000)]
Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am:
94b61cb340 am:
0ad55d5769
am:
b70255618a
Change-Id: Iac6873c142b102d46e8553316808f847b8b2f947
Peng Xu [Thu, 23 Jun 2016 03:44:48 +0000 (03:44 +0000)]
Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am:
94b61cb340 am:
72c538707c
am:
15ad0dacbc
Change-Id: Ica9e7b68a791c13a5ccf90aff70a5f0e2c4d92b2
Greg Kaiser [Thu, 23 Jun 2016 03:41:01 +0000 (03:41 +0000)]
Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am:
94b61cb340
am:
0ad55d5769
Change-Id: I5940a4b20b9d4be040a20679d2115c3c7fab5fb2
Greg Kaiser [Thu, 23 Jun 2016 03:37:58 +0000 (03:37 +0000)]
Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am:
94b61cb340
am:
72c538707c
Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059
Peng Xu [Thu, 23 Jun 2016 03:32:46 +0000 (03:32 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am:
94b61cb340
Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f
Peng Xu [Thu, 23 Jun 2016 03:32:46 +0000 (03:32 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am:
94b61cb340
Change-Id: I8803994892af96c0defc5eda5e9a806ce7ec1bc9
Greg Kaiser [Thu, 23 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Sensor: Make getId() more varied" into nyc-dev
Dianne Hackborn [Thu, 23 Jun 2016 03:25:07 +0000 (03:25 +0000)]
Merge \"Merge \\"Merge \\\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\\" into nyc-dev am:
576e6d27bd\\" into nyc-mr1-dev am:
fb801df278\" into nyc-mr1-dev-plus-aosp
am:
8801754965
Change-Id: I5cde211e9b867c5154feb73a802d2ce75a51e22e
Alan Viverette [Thu, 23 Jun 2016 03:25:04 +0000 (03:25 +0000)]
Merge \"Merge \\"Notify user when application does not support current display zoom\\" into nyc-mr1-dev am:
1a91866400\" into nyc-mr1-dev-plus-aosp
am:
b3e12b9aa9
Change-Id: I62537c464d93b49c6ca0a0c07cc6514e8a6fde7d
Dianne Hackborn [Thu, 23 Jun 2016 03:25:01 +0000 (03:25 +0000)]
Merge \\\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\\" into nyc-dev am:
576e6d27bd am:
c7ebca2a36
am:
569b988e22
Change-Id: Ibb8b0004ee7f1f6208558718247bfaa0b5a04348
Android Build Merger (Role) [Thu, 23 Jun 2016 03:20:35 +0000 (03:20 +0000)]
Merge "Merge \"Merge \\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am:
576e6d27bd\" into nyc-mr1-dev am:
fb801df278" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 23 Jun 2016 03:20:23 +0000 (03:20 +0000)]
Merge "Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev am:
1a91866400" into nyc-mr1-dev-plus-aosp
Dianne Hackborn [Thu, 23 Jun 2016 03:19:54 +0000 (03:19 +0000)]
Merge \"Merge \\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am:
576e6d27bd\" into nyc-mr1-dev
am:
fb801df278
Change-Id: I2b8a35c2e4f411506c89964d5e8c4a34a23c534e
Alan Viverette [Thu, 23 Jun 2016 03:19:51 +0000 (03:19 +0000)]
Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev
am:
1a91866400
Change-Id: I2cc46a18a47379783de0a78b411373d30860af0c
Dianne Hackborn [Thu, 23 Jun 2016 03:19:32 +0000 (03:19 +0000)]
Merge \\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am:
576e6d27bd
am:
c7ebca2a36
Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe
Android Build Merger (Role) [Thu, 23 Jun 2016 03:13:09 +0000 (03:13 +0000)]
Merge "Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev am:
576e6d27bd" into nyc-mr1-dev
Dianne Hackborn [Thu, 23 Jun 2016 03:10:16 +0000 (03:10 +0000)]
Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am:
576e6d27bd
Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
TreeHugger Robot [Thu, 23 Jun 2016 03:10:05 +0000 (03:10 +0000)]
Merge "Notify user when application does not support current display zoom" into nyc-mr1-dev
Dianne Hackborn [Thu, 23 Jun 2016 03:09:56 +0000 (03:09 +0000)]
Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am:
576e6d27bd
Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
Dianne Hackborn [Thu, 23 Jun 2016 03:04:25 +0000 (03:04 +0000)]
Merge "Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev
Andrii Kulian [Thu, 23 Jun 2016 02:41:12 +0000 (02:41 +0000)]
Merge \"Merge \\\"Don\\\'t compare intent filters on singleTask adjacent launch\\\" into nyc-dev am:
42147f0ff3 am:
83972553b4\" into nyc-mr1-dev-plus-aosp
am:
57e4abcd2d
Change-Id: Ia421c1f86708f3e726df0cd0b1e8bb1a1e9ea893
Ta-wei Yen [Thu, 23 Jun 2016 02:41:07 +0000 (02:41 +0000)]
Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am:
fbb87a0591
am:
6b4c1e2d9b
Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
Andrii Kulian [Thu, 23 Jun 2016 02:41:02 +0000 (02:41 +0000)]
Merge \\\"Don\\\'t compare intent filters on singleTask adjacent launch\\\" into nyc-dev am:
42147f0ff3 am:
d82efd36dc
am:
60de130179
Change-Id: Ib9d550db454a6a243845a70651127282b723b2d7
Android Build Merger (Role) [Thu, 23 Jun 2016 02:36:47 +0000 (02:36 +0000)]
Merge "Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3 am:
83972553b4" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Thu, 23 Jun 2016 02:36:22 +0000 (02:36 +0000)]
Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3
am:
83972553b4
Change-Id: I1f44567347b7364dfd545cb75a8db43ee1a047f7
Ta-wei Yen [Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)]
Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev
am:
fbb87a0591
Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
Andrii Kulian [Thu, 23 Jun 2016 02:35:28 +0000 (02:35 +0000)]
Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3
am:
d82efd36dc
Change-Id: I48fb59f6afa681e4846e13384befa12b7c7a7bf1
Ta-wei Yen [Thu, 23 Jun 2016 02:28:22 +0000 (02:28 +0000)]
Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev
Andrii Kulian [Thu, 23 Jun 2016 02:27:25 +0000 (02:27 +0000)]
Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am:
42147f0ff3
Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
Andrii Kulian [Thu, 23 Jun 2016 02:27:06 +0000 (02:27 +0000)]
Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am:
42147f0ff3
Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec
TreeHugger Robot [Thu, 23 Jun 2016 02:17:23 +0000 (02:17 +0000)]
Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev
Philip P. Moltmann [Thu, 23 Jun 2016 02:09:29 +0000 (02:09 +0000)]
Merge \\\"Do not launch non exposed add printer activity\\\" into nyc-dev am:
737be111cc am:
ce7fc6c0a1
am:
a0c99bda20
Change-Id: I3e07035416c06ff03df52b546b36e4ef4b3ec7a5
Philip P. Moltmann [Thu, 23 Jun 2016 02:04:09 +0000 (02:04 +0000)]
Merge \\\"Do not launch non exposed add printer activity\\\" into nyc-dev am:
737be111cc am:
89fe3e0169
am:
de247457be
Change-Id: I04ce338f871b55e6b19de016dad1e2f0a87f833c
Philip P. Moltmann [Thu, 23 Jun 2016 02:01:26 +0000 (02:01 +0000)]
Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am:
737be111cc
am:
ce7fc6c0a1
Change-Id: Ib9927ef0b49a467933bb0a1cd7f9ed3c7ff20748
Philip P. Moltmann [Thu, 23 Jun 2016 01:58:21 +0000 (01:58 +0000)]
Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am:
737be111cc
am:
89fe3e0169
Change-Id: I180895d413d789166609a1b5f95c3afdcb027137
Philip P. Moltmann [Thu, 23 Jun 2016 01:55:52 +0000 (01:55 +0000)]
Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am:
737be111cc
Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911
Philip P. Moltmann [Thu, 23 Jun 2016 01:55:13 +0000 (01:55 +0000)]
Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am:
737be111cc
Change-Id: Ib4ebd8ed3605de40b974a8a1417f0a8bac31d1e6
TreeHugger Robot [Thu, 23 Jun 2016 01:51:06 +0000 (01:51 +0000)]
Merge "Do not launch non exposed add printer activity" into nyc-dev
Yohei Yukawa [Thu, 23 Jun 2016 01:37:10 +0000 (01:37 +0000)]
Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am:
dc42d7dd13
am:
d02470f5a8
Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
Guang Zhu [Thu, 23 Jun 2016 01:36:53 +0000 (01:36 +0000)]
Merge \\"temporarily disable FakeSettingsProviderTest\\" into nyc-mr1-dev am:
2b0b1e5a94
am:
d630384cf3
Change-Id: Ib314d376c2103a7f65523ce9ffff75fd349d18dc
Yohei Yukawa [Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)]
Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev
am:
dc42d7dd13
Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
Guang Zhu [Thu, 23 Jun 2016 01:29:53 +0000 (01:29 +0000)]
Merge \"temporarily disable FakeSettingsProviderTest\" into nyc-mr1-dev
am:
2b0b1e5a94
Change-Id: Ic3152624c192074838dd7ebee82d4d4a2bf74533
Yohei Yukawa [Thu, 23 Jun 2016 01:25:36 +0000 (01:25 +0000)]
Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev
TreeHugger Robot [Thu, 23 Jun 2016 01:21:08 +0000 (01:21 +0000)]
Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev
Andrii Kulian [Thu, 23 Jun 2016 01:18:18 +0000 (01:18 +0000)]
Merge \"Merge \\\"Show unsopported display size dialog on relaunch\\\" into nyc-dev am:
354c8cde6c am:
c13127f2be\" into nyc-mr1-dev-plus-aosp
am:
95eb07851a
Change-Id: If57a2e80cc09927310c60f0bd2adefff0c9a15da
Andrii Kulian [Thu, 23 Jun 2016 01:18:13 +0000 (01:18 +0000)]
Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am:
22f887a014 am:
076b51536c
am:
7548d9bc6d
Change-Id: I2641d812725fdda80c220e4ed9a1d83b30c9fc88
Alan Viverette [Thu, 23 Jun 2016 01:18:08 +0000 (01:18 +0000)]
Merge \"Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am:
22f887a014 am:
54e12ac7f5\" into nyc-mr1-dev-plus-aosp
am:
dbedcbce13
Change-Id: I13fa2045667e8b48ee1068449f43cef73111ba88
Alan Viverette [Thu, 23 Jun 2016 01:12:46 +0000 (01:12 +0000)]
Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am:
22f887a014 am:
483a8dc097
am:
23f6f62ea4
Change-Id: Id34e978aa6a26e08bab147ea3e1aa3a6282227af
Android Build Merger (Role) [Thu, 23 Jun 2016 01:11:33 +0000 (01:11 +0000)]
Merge "Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am:
354c8cde6c am:
c13127f2be" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Thu, 23 Jun 2016 01:10:58 +0000 (01:10 +0000)]
Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am:
354c8cde6c
am:
c13127f2be
Change-Id: Ie4b2397641342303742198ef50c4e21d97909aaf
Alan Viverette [Thu, 23 Jun 2016 01:10:57 +0000 (01:10 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
076b51536c
Change-Id: Id4012c19b97a03a04850c2d1b307680b324e4890
Andrii Kulian [Thu, 23 Jun 2016 01:07:00 +0000 (01:07 +0000)]
Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am:
354c8cde6c
Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
Andrii Kulian [Thu, 23 Jun 2016 01:06:58 +0000 (01:06 +0000)]
Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am:
354c8cde6c
Change-Id: Iaf2b6e209c95223ad4fe45416606b48e08418ca3
Android Build Merger (Role) [Thu, 23 Jun 2016 01:06:43 +0000 (01:06 +0000)]
Merge "Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014 am:
54e12ac7f5" into nyc-mr1-dev-plus-aosp
Alan Viverette [Thu, 23 Jun 2016 01:06:15 +0000 (01:06 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
483a8dc097
Change-Id: I906d49ae22e3368792928910310f5ddc341edf8f
Alan Viverette [Thu, 23 Jun 2016 01:06:15 +0000 (01:06 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
54e12ac7f5
Change-Id: I64c2b1f76a5085945829a618a71e8e3c9e9253a1
Andrii Kulian [Thu, 23 Jun 2016 01:00:35 +0000 (01:00 +0000)]
Merge "Show unsopported display size dialog on relaunch" into nyc-dev
Alan Viverette [Thu, 23 Jun 2016 01:00:32 +0000 (01:00 +0000)]
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am:
22f887a014
Change-Id: I7311e8cb98da040148e961734646251949975270
Alan Viverette [Thu, 23 Jun 2016 01:00:18 +0000 (01:00 +0000)]
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am:
22f887a014
Change-Id: I84d345cde0d16e98ce3fefa703929f243a5fdced
Baligh Uddin [Thu, 23 Jun 2016 00:59:22 +0000 (00:59 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
b9aa9b47e7 -s ours am:
a0b34b32c3 -s ours
am:
4e1518aab4 -s ours
Change-Id: Ibea861436e981ece0148a04638550463fe99be39
Alan Viverette [Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev
Baligh Uddin [Thu, 23 Jun 2016 00:53:11 +0000 (00:53 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
b9aa9b47e7 -s ours am:
c446ef54ae -s ours
am:
c33f3fd0e4 -s ours
Change-Id: Ic50a2a219031b38bd7263598b5e442e40148492f
Baligh Uddin [Thu, 23 Jun 2016 00:52:11 +0000 (00:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
b9aa9b47e7 -s ours
am:
a0b34b32c3 -s ours
Change-Id: I85c704338b0a68a5743ba346ee361e0a3310b821
Baligh Uddin [Thu, 23 Jun 2016 00:48:53 +0000 (00:48 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
b9aa9b47e7 -s ours
am:
c446ef54ae -s ours
Change-Id: If7a2109f29f5b76bf1e40b4f92019a0dcd3613c6
Ta-wei Yen [Thu, 23 Jun 2016 00:48:52 +0000 (17:48 -0700)]
Add more configuration state for visual voicemail
Bug:
26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
Baligh Uddin [Thu, 23 Jun 2016 00:43:44 +0000 (00:43 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
b9aa9b47e7 -s ours
Change-Id: I5c878620d97c3c6e90b3579e1102f56e14a8c6eb
Baligh Uddin [Thu, 23 Jun 2016 00:43:40 +0000 (00:43 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
b9aa9b47e7 -s ours
Change-Id: I6800e94bd8ca728af636dc0b46768bee708c6236
Baligh Uddin [Thu, 23 Jun 2016 00:40:01 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Shibin George [Thu, 23 Jun 2016 00:34:52 +0000 (00:34 +0000)]
Merge \\\\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\\\" am:
4eea3a7f88 am:
42927c4e94 am:
b91869d35f
am:
ccb59c489a
Change-Id: I88960a574fb0a5b2a2db5e0cb3e8d4eb836463cd
Shibin George [Thu, 23 Jun 2016 00:27:13 +0000 (00:27 +0000)]
Merge \\\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\\" am:
4eea3a7f88 am:
42927c4e94
am:
b91869d35f
Change-Id: Ib0fb475a6b29b7c7d198197aa9dc363551b87505
Jim Miller [Thu, 23 Jun 2016 00:25:06 +0000 (00:25 +0000)]
Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am:
0520091641
am:
0a7efa1e47
Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538
Shibin George [Thu, 23 Jun 2016 00:24:23 +0000 (00:24 +0000)]
Merge \\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\" am:
4eea3a7f88
am:
42927c4e94
Change-Id: Ieb503007f420f06c599b8fc9f4703954885754b0
Jim Miller [Thu, 23 Jun 2016 00:20:57 +0000 (00:20 +0000)]
Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
am:
0520091641
Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
Shibin George [Thu, 23 Jun 2016 00:20:35 +0000 (00:20 +0000)]
Merge \"Fix deadlock b/w ActivityManagerService and MediaSessionService\"
am:
4eea3a7f88
Change-Id: I499c69fd3890ada652213c0510df3b884223a5df
Andrii Kulian [Thu, 23 Jun 2016 00:16:45 +0000 (17:16 -0700)]
Don't compare intent filters on singleTask adjacent launch
Bug:
29578845
Change-Id: Ic1614fc1f321e80ffdc2ab498d720657f393c239
Treehugger Robot [Thu, 23 Jun 2016 00:13:44 +0000 (00:13 +0000)]
Merge "Fix deadlock b/w ActivityManagerService and MediaSessionService"
Jim Miller [Thu, 23 Jun 2016 00:13:38 +0000 (00:13 +0000)]
Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
John Reck [Thu, 23 Jun 2016 00:01:02 +0000 (00:01 +0000)]
Merge \"Merge \\\"Change approach for windowPositionLostRT\\\" into nyc-dev am:
16038a0c5f am:
0a3a75e121\" into nyc-mr1-dev-plus-aosp
am:
045e8cadf6
Change-Id: I6b39d68223ef9a63abd0ebedb5770e9e15b773c9
John Reck [Wed, 22 Jun 2016 23:56:23 +0000 (23:56 +0000)]
Merge \\\"Change approach for windowPositionLostRT\\\" into nyc-dev am:
16038a0c5f am:
fdff97caf0
am:
c95bebfe39
Change-Id: I5536e84c5ded1213f315a3ab50fa9feb71e7d9cb
Dianne Hackborn [Wed, 22 Jun 2016 23:49:14 +0000 (16:49 -0700)]
Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.
Change-Id: Ic704850c9750b6a078c49ea628189be568031086
Android Build Merger (Role) [Wed, 22 Jun 2016 23:51:22 +0000 (23:51 +0000)]
Merge "Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f am:
0a3a75e121" into nyc-mr1-dev-plus-aosp
John Reck [Wed, 22 Jun 2016 23:50:54 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
0a3a75e121
Change-Id: I579930de1951b2112ce51016007a0358067f9934
John Reck [Wed, 22 Jun 2016 23:50:38 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
fdff97caf0
Change-Id: I1a2158abc35bd9da5e1e7b5cfc93867a938a5b70
John Reck [Wed, 22 Jun 2016 23:45:50 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: I80f6bf6d169c43a10106857627f5c127d94d00a4
John Reck [Wed, 22 Jun 2016 23:45:34 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00
Philip P. Moltmann [Wed, 22 Jun 2016 23:12:27 +0000 (16:12 -0700)]
Do not launch non exposed add printer activity
Change-Id: I0b9b11ea0ce0140c77dff2539b1a0a9dcf1558b0
Fixes:
29580579
Adam Powell [Wed, 22 Jun 2016 23:40:25 +0000 (23:40 +0000)]
Merge "Clarify Fragment#setUserVisibleHint guarantees in docs"
John Reck [Wed, 22 Jun 2016 23:38:23 +0000 (23:38 +0000)]
Merge "Change approach for windowPositionLostRT" into nyc-dev
Baligh Uddin [Wed, 22 Jun 2016 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29322470
Change-Id: Iec697120d3e8b234bde18e0e37f02ad532796816
Yohei Yukawa [Wed, 22 Jun 2016 23:31:41 +0000 (16:31 -0700)]
Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.
With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission. Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.
Here is a sample code snippet about how to use this mechanism.
[IME]
InputContentInfo contentInfo = new InputContentInfo(
contentUri,
new ClipDescription(description, new String[]{mimeType}),
linkUrl);
exposeContent(contentInfo, getCurrentInputEditorInfo());
getCurrentInputConnection().commitContent(inputContentInfo, null);
[App]
try {
contentInfo.requestPermission();
// Load inputContentInfo.getContentUri() here.
} finally {
contentInfo.releasePermission();
}
[1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
152944f4909c47917473293b258d266435c6ab35
[2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
adebb52588b098a1af678d4e33a234ef1ce783b2
Bug:
29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
Guang Zhu [Wed, 22 Jun 2016 23:30:09 +0000 (16:30 -0700)]
temporarily disable FakeSettingsProviderTest
Bug:
29281167
Change-Id: I463d7707c197bd114de762c86e3b3e574d456e3b
OSDN Git Service
