Commit Graph

277484 Commits

Author SHA1 Message Date
Christopher Tate
1131f280ae Fix job scheduler crash due to uninstall race
am: 652c5ad516

Change-Id: Ied6a4348eb3a9293ff496f3bd56af4729126c5cf
2016-10-06 21:12:57 +00:00
Jakub Pawlowski
4984d66b6a Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791
am: 56757a44a6

Change-Id: I3bdacc816923d012f061e5310d5e076fcaf9d387
2016-10-06 21:12:06 +00:00
Hugo Benichi
4b0e3098f2 Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev
am: 69544fd74d

Change-Id: Ib0bfee0896ed3b6e2fc776fc064b970bf6ab18ba
2016-10-06 21:11:51 +00:00
Hugo Benichi
c4a13afe92 Catch runtime exceptions when parsing DHCP packets
am: e0ea7fecd6

Change-Id: I1e701bb19b5c062f1527dd3e5b79e2e7860ca025
2016-10-06 21:11:47 +00:00
Amanda Kassay
ad45b14606 Wear Preview, auto, tv, versions project metadata. b/31771704 b/31903798 b/31773716 am: fd6846e116 am: a7e9861112
am: 5aab061303

Change-Id: I655aefe5deb73e232d257b9d0c1c4e6bd14e8088
2016-10-06 21:11:01 +00:00
Bill Yi
dcc4542c05 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 5e6fb1699f  -s ours

Change-Id: I2caf561510ebe5517040476e24921709f1765f60
2016-10-06 21:09:49 +00:00
Bill Yi
df10fcf220 Import translations. DO NOT MERGE
am: 41cf6c32a1  -s ours

Change-Id: If323a39228dbac08c42bf1ee70279cbc528e78d8
2016-10-06 21:09:47 +00:00
Bill Yi
d8ae5393a8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f381889844  -s ours

Change-Id: Id71bc5054fb8df28f0402757bf469e357e382b11
2016-10-06 21:08:37 +00:00
Bill Yi
925f4f35b5 Import translations. DO NOT MERGE
am: e6327db2af  -s ours

Change-Id: I79712be6e299e0b0dd0eec86c25945a73acac62a
2016-10-06 21:08:35 +00:00
Nancy Zheng
ef866c3d0f Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService.
am: e39a8a46d9

Change-Id: Ic3aae2ed74eaf354d0a2439a9e8ff4b9e70d7e42
2016-10-06 21:07:48 +00:00
Jakub Pawlowski
56757a44a6 Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739
am: 6fe3900791

Change-Id: I8e04aa89379c4a50031fade065c288fd1cc30668
2016-10-06 21:07:44 +00:00
Tenghui Zhu
f8bfc7890f Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev
am: 8e93abcd6c

Change-Id: Ifc3cc4bd8f4ae385a19919bab1a58f54d819af6e
2016-10-06 21:06:41 +00:00
Teng-Hui Zhu
9ad599930d Make umbra lighter when the blocker is too high and has no real umbra area.
am: 9c555566bf

Change-Id: I785f5a25aae97f8852bb1cc4833f2662411eabc3
2016-10-06 21:06:36 +00:00
Winson Chung
f4e866947f Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev
am: e8ebe11209

Change-Id: I476da3de1a4c850d9c1e6947d53657c436e58d48
2016-10-06 21:05:19 +00:00
Winson Chung
1fb2e3db87 Revert "Bump up preloading recents on boot up to user unlocked."
am: 501d59dcea

Change-Id: I0f0c63f38bd1e43dbf0196ded6ceb2e829c94ec1
2016-10-06 21:05:17 +00:00
Treehugger Robot
8d08d0fa83 Merge "Correctly pass number of input allocations for BLAS" 2016-10-06 21:04:56 +00:00
Adrian Roos
1a299d8052 Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev
am: b9bb518632

Change-Id: Id8c2d014c1d66e7f1cd1a83e7074d46bc57e8644
2016-10-06 21:04:02 +00:00
Adrian Roos
7157eb844a Ambient: Re-register all trigger sensors if one fires
am: 0288dcc825

Change-Id: Ia5e7c73eadb831e409aafd657427af98d242cdd2
2016-10-06 21:03:54 +00:00
Jason Monk
df6c5162c7 Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev am: 3523728e77
am: 80c4bc6bf0

Change-Id: If9f1a9308216cb6c45650a24de58470deb2f4097
2016-10-06 21:03:26 +00:00
Dirk Dougherty
ce9fda304c Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am: 794e0d3578 am: fc7475c5b3
am: 5d6be1abca

Change-Id: If6b795ed3864e721c1e06eee98839ca3505326a6
2016-10-06 21:03:02 +00:00
Jason Monk
0490a848c1 QS: Don't set flashlight state when we don't have an id am: ad32c550c0
am: 3a8037d449

Change-Id: If5abe50cce6670ac3a484972309c722b09fa33bf
2016-10-06 21:02:25 +00:00
Dirk Dougherty
256dfeea14 Doc change: remove intl/nn from collections paths. am: 240ddd735c am: 016f01ebfe
am: 7ceecc61ec

Change-Id: I0f7cf93959aed7eb8c425967f3b54e896d734606
2016-10-06 21:02:10 +00:00
Dirk Dougherty
7c2e40c715 Merge "Update preview-community redirect to point at +AD." into nyc-dev am: 61d3faa52c am: 8f8fe7df92
am: 7f5f8b1df8

Change-Id: Id93f4f296eb20ca951a0e1bde6df445ec6c7c4fc
2016-10-06 21:01:10 +00:00
Jakub Pawlowski
6fe3900791 Merge "Fix connecting to profiles when bonding from local device (1/3)"
am: 44c013d739

Change-Id: I4cc9e7c960e51ec49fcaf3f16968afac7b6cc471
2016-10-06 21:00:51 +00:00
Dirk Dougherty
c96f065bce Update preview-community redirect to point at +AD. am: 559013e711 am: 1241838fb4
am: ddd2e0442e

Change-Id: Ie92e3fc281de627fd81df6196e7886ff6c4bcc0d
2016-10-06 21:00:18 +00:00
Dianne Hackborn
6420ce51d0 Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
am: 534a17e96c

Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975
2016-10-06 20:58:58 +00:00
Dianne Hackborn
50b9f3513c Fix issue #31305336: File corrupt: too many wake locks 101
am: cb99a72e62

Change-Id: I01062999e2a1207c5d1bc826e8c9372c0fb012f7
2016-10-06 20:58:54 +00:00
Lei Yu
768ceb9e25 Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev am: 3fd73a645a
am: 949273e45d

Change-Id: I7d4d9f312be923d8d19e19bef7202a2093451564
2016-10-06 20:58:17 +00:00
Wei Liu
99892beb39 Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
am: 30a0f96250

Change-Id: I9b65c17d58907c861956bec0bc8f9f91ad8890af
2016-10-06 20:58:04 +00:00
jackqdyulei
b9b59babe3 Add "FILTER_NOT_HIDE" to filter out the apps. am: 4bf191ca75
am: 6b88c550af

Change-Id: Ic772b24c129df56e94841015af36b90f78697956
2016-10-06 20:57:14 +00:00
Bill Yi
035727cf32 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e03f970ab4 -s ours
am: 9474a63f50  -s ours

Change-Id: I92a660de6d28c7e1c66ed74b5258549f2f1c852e
2016-10-06 20:55:55 +00:00
Bill Yi
df14300b5e Import translations. DO NOT MERGE am: cf2df3bb6e -s ours
am: 778f8930b4  -s ours

Change-Id: I057aa96192682cd62caebdd2b1db0614d2e81cc0
2016-10-06 20:55:01 +00:00
Jakub Pawlowski
44c013d739 Merge "Fix connecting to profiles when bonding from local device (1/3)" 2016-10-06 20:54:08 +00:00
Bill Yi
af0c4f4f89 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f22cb06b4d -s ours
am: d5762192f7  -s ours

Change-Id: I5337def39947c7d9101121e030b8674373f607c4
2016-10-06 20:54:05 +00:00
Bill Yi
ea0179942b Import translations. DO NOT MERGE am: 49baec862b -s ours
am: d89a7ca92d  -s ours

Change-Id: I3bd7345ff0b81a9d41040e183ac42015294106c5
2016-10-06 20:53:03 +00:00
Jorim Jaggi
ce32ea697f Merge "Reload state when user unlocks" into nyc-mr1-dev am: a92006ef6c
am: a58cb2e4d7

Change-Id: Ia4b60c1744d3f8af3d242fc16d910e02bad9ad34
2016-10-06 20:52:05 +00:00
Jorim Jaggi
2a30b76009 Reload state when user unlocks am: dadafd4109
am: 1ad950823b

Change-Id: I26b1826986ccba9d0c7fc1a6adb6f9118795557a
2016-10-06 20:51:08 +00:00
Andreas Gampe
636451443f Debug: Add test for bug 31943543
Bug: 31943543
Test: adb shell setprop debug.checkjni 1 && runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: I895f3f9927ed3572dc4e77b49d12cadd53ce5d6a
2016-10-06 13:49:52 -07:00
Lorenzo Colitti
5ab84cff1a Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am: 291af5c568 am: 80f15e3b4c
am: 6632944a01

Change-Id: I410b0d058e46b431b8064f6e54298bde65ab3f54
2016-10-06 20:48:48 +00:00
Lorenzo Colitti
446ea5678a Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. am: f11ee9f592 am: d2ad8ece53
am: 52807ea4f1

Change-Id: I3a3f7537ab5b871bff52ea402806552d86aa36cd
2016-10-06 20:47:42 +00:00
Lorenzo Colitti
67b5994bb6 Slightly simplify IpManager#compareProvisioning. am: b77b775213 am: fdac9b608b
am: 6f8180cfe0

Change-Id: I0080ecfe90440c3ba3e5c1ca66694b58fe60a140
2016-10-06 20:46:36 +00:00
Erik Kline
d938b95cec Conditionally accept loss of on-link IPv6 DNS servers am: 5b437d6ff9 am: d719d95139
am: c0a910aaf1

Change-Id: Ie566c92bbd78e65a678df971ff6876e0defccb48
2016-10-06 20:45:49 +00:00
Erik Kline
73b9d8061c Refactor "avoid bad wifi" logic into a utility class am: 065ab6ee40 am: 23cdacbec6
am: 0cb8d5247e

Change-Id: I7db61e54c80ec836d00bf4ae087137bb296c30f1
2016-10-06 20:44:56 +00:00
Doris Liu
e5e95e083a Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev am: 8d4c87b0bf
am: e4459da272

Change-Id: Ibbbb1b912abb9a4c8950e9f6b7f5117621a02da6
2016-10-06 20:44:00 +00:00
Doris Liu
43104389f9 Restrict AVD and VD parsing to the current element instead of the whole document am: 1f859716a8
am: 897f5ca748

Change-Id: Ifc946e58e0455dac385f34a92e4181144a36edd8
2016-10-06 20:43:07 +00:00
Tenghui Zhu
a07f03ea92 Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev am: 99224b311c
am: 3445b58a6d

Change-Id: I81a5d603b4f6608c5cf0b03f965b4796071982c6
2016-10-06 20:42:05 +00:00
Teng-Hui Zhu
a504e12e25 Update JavaDoc about animatable on VectorDrawable am: bb12929470
am: 8bf7fd89e7

Change-Id: I2fcb755d5d36f6268c98e985e23bdf886e7a5e0a
2016-10-06 20:41:01 +00:00
Adam Lesinski
157d864264 Merge "Fix thread race caused double free issue." into nyc-mr1-dev am: 68ec3695d0
am: a2b5c8a912

Change-Id: I9ceebadf59e2355d2cf4e101fbe67a8de54ccf99
2016-10-06 20:40:09 +00:00
songjinshi
995c7a410b Fix thread race caused double free issue. am: 5754b41c20
am: 09901f3bc9

Change-Id: Ied71f524dcb24439e121598beaec59029474cc4d
2016-10-06 20:39:10 +00:00
Bert McMeen
3da2d04626 Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10 am: 19404c6f93 am: 20cf00152d
am: c9956e2ea8

Change-Id: Ie05921c5492319d5d9c37ea22247ce1eae2d65cb
2016-10-06 20:38:16 +00:00