drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
270,693 Commits 1 Branch 0 Tags
Commit Graph

270693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
0e3a17ec10 Import translations. DO NOT MERGE 
Change-Id: Ic4aca8b4e91679ca29ec66f4b60f7fc7eb88e835
Auto-generated-cl: translation import
 2016-06-23 15:08:57 -07:00
Lorenzo Colitti
71ea683b62 Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am: 7aac630f8e am: 5719a7f478 
am: 1767dd1af7

Change-Id: I276bd8cafdc0985f1e5ce4a40ed253e8dc93ce2d
 2016-06-23 08:32:15 +00:00
Lorenzo Colitti
23e08805c5 Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am: 7aac630f8e am: affc4c1347 
am: 44e6ac0c40

Change-Id: I4bea027753bd0c9564a6d5b52440ab223864b3a0
 2016-06-23 08:32:13 +00:00
Lorenzo Colitti
1767dd1af7 Merge \\"Don\\'t loop forever on 0-length options.\\" into nyc-dev am: 7aac630f8e 
am: 5719a7f478

Change-Id: I6817f8f9c7a83400a710144a8b57b6303082201f
 2016-06-23 08:28:20 +00:00
Lorenzo Colitti
44e6ac0c40 Merge \\"Don\\'t loop forever on 0-length options.\\" into nyc-dev am: 7aac630f8e 
am: affc4c1347

Change-Id: Icedd33aa2cb5a4a76e2ab7a0be2a2051a40b8624
 2016-06-23 08:24:12 +00:00
Lorenzo Colitti
5719a7f478 Merge \"Don\'t loop forever on 0-length options.\" into nyc-dev 
am: 7aac630f8e

Change-Id: Icd3c0265ffb30232642f581a7c0031ed55ee6d21
 2016-06-23 08:23:18 +00:00
Lorenzo Colitti
affc4c1347 Merge \"Don\'t loop forever on 0-length options.\" into nyc-dev 
am: 7aac630f8e

Change-Id: I188441196255ffe132adef00728502101199756b
 2016-06-23 08:18:03 +00:00
TreeHugger Robot
7aac630f8e Merge "Don't loop forever on 0-length options." into nyc-dev 2016-06-23 08:10:17 +00:00
Lorenzo Colitti
8995d85b94 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
 2016-06-23 15:43:34 +09:00
Peng Xu
9a49d486e3 Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am: 94b61cb340 am: 0ad55d5769 
am: b70255618a

Change-Id: Iac6873c142b102d46e8553316808f847b8b2f947
 2016-06-23 03:50:56 +00:00
Peng Xu
132c67b56f Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am: 94b61cb340 am: 72c538707c 
am: 15ad0dacbc

Change-Id: Ica9e7b68a791c13a5ccf90aff70a5f0e2c4d92b2
 2016-06-23 03:44:48 +00:00
Greg Kaiser
b70255618a Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340 
am: 0ad55d5769

Change-Id: I5940a4b20b9d4be040a20679d2115c3c7fab5fb2
 2016-06-23 03:41:01 +00:00
Greg Kaiser
15ad0dacbc Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340 
am: 72c538707c

Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059
 2016-06-23 03:37:58 +00:00
Peng Xu
0ad55d5769 Merge \"Sensor: Make getId() more varied\" into nyc-dev 
am: 94b61cb340

Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f
 2016-06-23 03:32:46 +00:00
Peng Xu
72c538707c Merge \"Sensor: Make getId() more varied\" into nyc-dev 
am: 94b61cb340

Change-Id: I8803994892af96c0defc5eda5e9a806ce7ec1bc9
 2016-06-23 03:32:46 +00:00
Greg Kaiser
94b61cb340 Merge "Sensor: Make getId() more varied" into nyc-dev 2016-06-23 03:25:46 +00:00
Dianne Hackborn
d032b8ca06 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
 2016-06-23 03:25:07 +00:00
Alan Viverette
04fdda769e 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
 2016-06-23 03:25:04 +00:00
Dianne Hackborn
9a4172245e Merge \\\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\\" into nyc-dev am: 576e6d27bd am: c7ebca2a36 
am: 569b988e22

Change-Id: Ibb8b0004ee7f1f6208558718247bfaa0b5a04348
 2016-06-23 03:25:01 +00:00
Android Build Merger (Role)
8801754965 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 2016-06-23 03:20:37 +00:00
Android Build Merger (Role)
b3e12b9aa9 Merge "Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev am: 1a91866400" into nyc-mr1-dev-plus-aosp 2016-06-23 03:20:24 +00:00
Dianne Hackborn
a11ee6eae2 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
 2016-06-23 03:19:54 +00:00
Alan Viverette
fc10f2bfdd Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev 
am: 1a91866400

Change-Id: I2cc46a18a47379783de0a78b411373d30860af0c
 2016-06-23 03:19:51 +00:00
Dianne Hackborn
569b988e22 Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am: 576e6d27bd 
am: c7ebca2a36

Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe
 2016-06-23 03:19:32 +00:00
Android Build Merger (Role)
fb801df278 Merge "Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev am: 576e6d27bd" into nyc-mr1-dev 2016-06-23 03:13:11 +00:00
Dianne Hackborn
a8816eaf0e Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev 
am: 576e6d27bd

Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
 2016-06-23 03:10:16 +00:00
TreeHugger Robot
1a91866400 Merge "Notify user when application does not support current display zoom" into nyc-mr1-dev 2016-06-23 03:10:11 +00:00
Dianne Hackborn
c7ebca2a36 Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev 
am: 576e6d27bd

Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
 2016-06-23 03:09:56 +00:00
Dianne Hackborn
576e6d27bd Merge "Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev 2016-06-23 03:04:26 +00:00
Andrii Kulian
dcd6bd83c3 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
 2016-06-23 02:41:12 +00:00
Ta-wei Yen
3bfaeb7c6f Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a0591 
am: 6b4c1e2d9b

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
 2016-06-23 02:41:07 +00:00
Andrii Kulian
b2adcb97ee Merge \\\"Don\\\'t compare intent filters on singleTask adjacent launch\\\" into nyc-dev am: 42147f0ff3 am: d82efd36dc 
am: 60de130179

Change-Id: Ib9d550db454a6a243845a70651127282b723b2d7
 2016-06-23 02:41:02 +00:00
Android Build Merger (Role)
57e4abcd2d Merge "Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am: 42147f0ff3 am: 83972553b4" into nyc-mr1-dev-plus-aosp 2016-06-23 02:36:48 +00:00
Andrii Kulian
35d45d8070 Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am: 42147f0ff3 
am: 83972553b4

Change-Id: I1f44567347b7364dfd545cb75a8db43ee1a047f7
 2016-06-23 02:36:22 +00:00
Ta-wei Yen
6b4c1e2d9b Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev 
am: fbb87a0591

Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
 2016-06-23 02:35:38 +00:00
Andrii Kulian
60de130179 Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am: 42147f0ff3 
am: d82efd36dc

Change-Id: I48fb59f6afa681e4846e13384befa12b7c7a7bf1
 2016-06-23 02:35:28 +00:00
Ta-wei Yen
fbb87a0591 Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev 2016-06-23 02:28:24 +00:00
Andrii Kulian
d82efd36dc Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev 
am: 42147f0ff3

Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
 2016-06-23 02:27:25 +00:00
Andrii Kulian
83972553b4 Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev 
am: 42147f0ff3

Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec
 2016-06-23 02:27:06 +00:00
TreeHugger Robot
42147f0ff3 Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev 2016-06-23 02:17:24 +00:00
Philip P. Moltmann
5e7855b39f Merge \\\"Do not launch non exposed add printer activity\\\" into nyc-dev am: 737be111cc am: ce7fc6c0a1 
am: a0c99bda20

Change-Id: I3e07035416c06ff03df52b546b36e4ef4b3ec7a5
 2016-06-23 02:09:29 +00:00
Philip P. Moltmann
9599a99ee1 Merge \\\"Do not launch non exposed add printer activity\\\" into nyc-dev am: 737be111cc am: 89fe3e0169 
am: de247457be

Change-Id: I04ce338f871b55e6b19de016dad1e2f0a87f833c
 2016-06-23 02:04:09 +00:00
Philip P. Moltmann
a0c99bda20 Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am: 737be111cc 
am: ce7fc6c0a1

Change-Id: Ib9927ef0b49a467933bb0a1cd7f9ed3c7ff20748
 2016-06-23 02:01:26 +00:00
Philip P. Moltmann
de247457be Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am: 737be111cc 
am: 89fe3e0169

Change-Id: I180895d413d789166609a1b5f95c3afdcb027137
 2016-06-23 01:58:21 +00:00
Philip P. Moltmann
ce7fc6c0a1 Merge \"Do not launch non exposed add printer activity\" into nyc-dev 
am: 737be111cc

Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911
 2016-06-23 01:55:52 +00:00
Philip P. Moltmann
89fe3e0169 Merge \"Do not launch non exposed add printer activity\" into nyc-dev 
am: 737be111cc

Change-Id: Ib4ebd8ed3605de40b974a8a1417f0a8bac31d1e6
 2016-06-23 01:55:13 +00:00
TreeHugger Robot
737be111cc Merge "Do not launch non exposed add printer activity" into nyc-dev 2016-06-23 01:51:08 +00:00
Yohei Yukawa
bf055ba658 Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13 
am: d02470f5a8

Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
 2016-06-23 01:37:10 +00:00
Guang Zhu
4667fd17d8 Merge \\"temporarily disable FakeSettingsProviderTest\\" into nyc-mr1-dev am: 2b0b1e5a94 
am: d630384cf3

Change-Id: Ib314d376c2103a7f65523ce9ffff75fd349d18dc
 2016-06-23 01:36:53 +00:00
Yohei Yukawa
d02470f5a8 Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev 
am: dc42d7dd13

Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
 2016-06-23 01:29:58 +00:00