OSDN Git Service
Dirk Dougherty [Thu, 6 Oct 2016 21:31:28 +0000 (21:31 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe am:
7ceecc61ec
am:
256dfeea14
Change-Id: Iaf5532f2978482c63d0720b63aff51a1bbf9fc51
Dirk Dougherty [Thu, 6 Oct 2016 21:30:33 +0000 (21:30 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92 am:
7f5f8b1df8
am:
7c2e40c715
Change-Id: I68bc342d2a6f741a4c6660f29e929e717f651293
Dirk Dougherty [Thu, 6 Oct 2016 21:29:29 +0000 (21:29 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4 am:
ddd2e0442e
am:
c96f065bce
Change-Id: I7af8fad20356137bdb481454a72c69397f0f647a
Dianne Hackborn [Thu, 6 Oct 2016 21:28:34 +0000 (21:28 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev am:
534a17e96c
am:
6420ce51d0
Change-Id: I9782662b026388f05d6ad06a4275405f169db030
Dianne Hackborn [Thu, 6 Oct 2016 21:27:35 +0000 (21:27 +0000)]
Fix issue #
31305336: File corrupt: too many wake locks 101 am:
cb99a72e62
am:
50b9f3513c
Change-Id: Idfc3a5413248ac0b74f88d21a9f1f4f642b3f73c
Wei Liu [Thu, 6 Oct 2016 21:26:51 +0000 (21:26 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev am:
30a0f96250
am:
99892beb39
Change-Id: I0b77ca3e14678a6eff608ca7c0279fe7ee9d430e
Wei Liu [Thu, 6 Oct 2016 21:25:07 +0000 (21:25 +0000)]
Allow shell to acquire wakelock. DO NOT MERGE. am:
898468657e
am:
ec7c07e2a5
Change-Id: I2dc33af5b2e19f07c5ae908f4cfa1a2bd24aef76
Christopher Tate [Thu, 6 Oct 2016 21:24:04 +0000 (21:24 +0000)]
Eliminate unnecessary object churn in job scheduler updating am:
eafb535072
am:
84e9961a7c
Change-Id: I1df15d655f7782f3cc8ecd051ad3f0268ae8b7a7
Paul Stewart [Thu, 6 Oct 2016 21:23:08 +0000 (21:23 +0000)]
Merge "Tethering: check if configManager is null" into nyc-mr1-dev am:
7d25ab7b11
am:
7a587e85cd
Change-Id: I1f8ceb90fae45347a051fb766a462bc3fd9b1eaf
Rebecca Silberstein [Thu, 6 Oct 2016 21:22:12 +0000 (21:22 +0000)]
Tethering: check if configManager is null am:
b07f140904
am:
7aca691f27
Change-Id: I22beafaea3a01e5475d1eb3904b7ceb41dc98eaa
Rob Carr [Thu, 6 Oct 2016 21:20:32 +0000 (21:20 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev am:
c65dc5529e
am:
2c1a026ee5
Change-Id: I6be8174475b7fce7b6c488cad3a9a2d2a633a24d
Robert Carr [Thu, 6 Oct 2016 21:19:21 +0000 (21:19 +0000)]
Prevent any rotation while seamless rotation is pending. am:
b14d4abc16
am:
eb461fca5a
Change-Id: Id88cf66355fccf6d141f7177f4323124efec7e9c
Robert Carr [Thu, 6 Oct 2016 21:18:29 +0000 (21:18 +0000)]
Prevent triggering orientation changes until previous completes. am:
45f6a2718a
am:
3165c49908
Change-Id: I9cd27eefc303344262798e067326bf89c601daab
Jakub Pawlowski [Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)" am:
44c013d739 am:
6fe3900791
am:
56757a44a6
Change-Id: I3bdacc816923d012f061e5310d5e076fcaf9d387
Jakub Pawlowski [Thu, 6 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)" am:
44c013d739
am:
6fe3900791
Change-Id: I8e04aa89379c4a50031fade065c288fd1cc30668
Jason Monk [Thu, 6 Oct 2016 21:03:26 +0000 (21:03 +0000)]
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
Jason Monk [Thu, 6 Oct 2016 21:02:25 +0000 (21:02 +0000)]
QS: Don't set flashlight state when we don't have an id am:
ad32c550c0
am:
3a8037d449
Change-Id: If5abe50cce6670ac3a484972309c722b09fa33bf
Dirk Dougherty [Thu, 6 Oct 2016 21:02:10 +0000 (21:02 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe
am:
7ceecc61ec
Change-Id: I0f7cf93959aed7eb8c425967f3b54e896d734606
Dirk Dougherty [Thu, 6 Oct 2016 21:01:10 +0000 (21:01 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92
am:
7f5f8b1df8
Change-Id: Id93f4f296eb20ca951a0e1bde6df445ec6c7c4fc
Jakub Pawlowski [Thu, 6 Oct 2016 21:00:51 +0000 (21:00 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
am:
44c013d739
Change-Id: I4cc9e7c960e51ec49fcaf3f16968afac7b6cc471
Dirk Dougherty [Thu, 6 Oct 2016 21:00:18 +0000 (21:00 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4
am:
ddd2e0442e
Change-Id: Ie92e3fc281de627fd81df6196e7886ff6c4bcc0d
Dianne Hackborn [Thu, 6 Oct 2016 20:58:58 +0000 (20:58 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
am:
534a17e96c
Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975
Dianne Hackborn [Thu, 6 Oct 2016 20:58:54 +0000 (20:58 +0000)]
Fix issue #
31305336: File corrupt: too many wake locks 101
am:
cb99a72e62
Change-Id: I01062999e2a1207c5d1bc826e8c9372c0fb012f7
Lei Yu [Thu, 6 Oct 2016 20:58:17 +0000 (20:58 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev am:
3fd73a645a
am:
949273e45d
Change-Id: I7d4d9f312be923d8d19e19bef7202a2093451564
Wei Liu [Thu, 6 Oct 2016 20:58:04 +0000 (20:58 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
am:
30a0f96250
Change-Id: I9b65c17d58907c861956bec0bc8f9f91ad8890af
jackqdyulei [Thu, 6 Oct 2016 20:57:14 +0000 (20:57 +0000)]
Add "FILTER_NOT_HIDE" to filter out the apps. am:
4bf191ca75
am:
6b88c550af
Change-Id: Ic772b24c129df56e94841015af36b90f78697956
Bill Yi [Thu, 6 Oct 2016 20:55:55 +0000 (20:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e03f970ab4 -s ours
am:
9474a63f50 -s ours
Change-Id: I92a660de6d28c7e1c66ed74b5258549f2f1c852e
Bill Yi [Thu, 6 Oct 2016 20:55:01 +0000 (20:55 +0000)]
Import translations. DO NOT MERGE am:
cf2df3bb6e -s ours
am:
778f8930b4 -s ours
Change-Id: I057aa96192682cd62caebdd2b1db0614d2e81cc0
Jakub Pawlowski [Thu, 6 Oct 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
Bill Yi [Thu, 6 Oct 2016 20:54:05 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f22cb06b4d -s ours
am:
d5762192f7 -s ours
Change-Id: I5337def39947c7d9101121e030b8674373f607c4
Bill Yi [Thu, 6 Oct 2016 20:53:03 +0000 (20:53 +0000)]
Import translations. DO NOT MERGE am:
49baec862b -s ours
am:
d89a7ca92d -s ours
Change-Id: I3bd7345ff0b81a9d41040e183ac42015294106c5
Jorim Jaggi [Thu, 6 Oct 2016 20:52:05 +0000 (20:52 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev am:
a92006ef6c
am:
a58cb2e4d7
Change-Id: Ia4b60c1744d3f8af3d242fc16d910e02bad9ad34
Jorim Jaggi [Thu, 6 Oct 2016 20:51:08 +0000 (20:51 +0000)]
Reload state when user unlocks am:
dadafd4109
am:
1ad950823b
Change-Id: I26b1826986ccba9d0c7fc1a6adb6f9118795557a
Lorenzo Colitti [Thu, 6 Oct 2016 20:48:48 +0000 (20:48 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am:
291af5c568 am:
80f15e3b4c
am:
6632944a01
Change-Id: I410b0d058e46b431b8064f6e54298bde65ab3f54
Lorenzo Colitti [Thu, 6 Oct 2016 20:47:42 +0000 (20:47 +0000)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. am:
f11ee9f592 am:
d2ad8ece53
am:
52807ea4f1
Change-Id: I3a3f7537ab5b871bff52ea402806552d86aa36cd
Lorenzo Colitti [Thu, 6 Oct 2016 20:46:36 +0000 (20:46 +0000)]
Slightly simplify IpManager#compareProvisioning. am:
b77b775213 am:
fdac9b608b
am:
6f8180cfe0
Change-Id: I0080ecfe90440c3ba3e5c1ca66694b58fe60a140
Erik Kline [Thu, 6 Oct 2016 20:45:49 +0000 (20:45 +0000)]
Conditionally accept loss of on-link IPv6 DNS servers am:
5b437d6ff9 am:
d719d95139
am:
c0a910aaf1
Change-Id: Ie566c92bbd78e65a678df971ff6876e0defccb48
Erik Kline [Thu, 6 Oct 2016 20:44:56 +0000 (20:44 +0000)]
Refactor "avoid bad wifi" logic into a utility class am:
065ab6ee40 am:
23cdacbec6
am:
0cb8d5247e
Change-Id: I7db61e54c80ec836d00bf4ae087137bb296c30f1
Doris Liu [Thu, 6 Oct 2016 20:44:00 +0000 (20:44 +0000)]
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
Doris Liu [Thu, 6 Oct 2016 20:43:07 +0000 (20:43 +0000)]
Restrict AVD and VD parsing to the current element instead of the whole document am:
1f859716a8
am:
897f5ca748
Change-Id: Ifc946e58e0455dac385f34a92e4181144a36edd8
Tenghui Zhu [Thu, 6 Oct 2016 20:42:05 +0000 (20:42 +0000)]
Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev am:
99224b311c
am:
3445b58a6d
Change-Id: I81a5d603b4f6608c5cf0b03f965b4796071982c6
Teng-Hui Zhu [Thu, 6 Oct 2016 20:41:01 +0000 (20:41 +0000)]
Update JavaDoc about animatable on VectorDrawable am:
bb12929470
am:
8bf7fd89e7
Change-Id: I2fcb755d5d36f6268c98e985e23bdf886e7a5e0a
Adam Lesinski [Thu, 6 Oct 2016 20:40:09 +0000 (20:40 +0000)]
Merge "Fix thread race caused double free issue." into nyc-mr1-dev am:
68ec3695d0
am:
a2b5c8a912
Change-Id: I9ceebadf59e2355d2cf4e101fbe67a8de54ccf99
songjinshi [Thu, 6 Oct 2016 20:39:10 +0000 (20:39 +0000)]
Fix thread race caused double free issue. am:
5754b41c20
am:
09901f3bc9
Change-Id: Ied71f524dcb24439e121598beaec59029474cc4d
Bert McMeen [Thu, 6 Oct 2016 20:38:16 +0000 (20:38 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10 am:
19404c6f93 am:
20cf00152d
am:
c9956e2ea8
Change-Id: Ie05921c5492319d5d9c37ea22247ce1eae2d65cb
Wei Liu [Thu, 6 Oct 2016 20:38:03 +0000 (20:38 +0000)]
Allow shell to acquire wakelock. DO NOT MERGE.
am:
898468657e
Change-Id: I443d617d58c23a12072c39b2e09b7f812cd46eaf
Chris Tate [Thu, 6 Oct 2016 20:37:19 +0000 (20:37 +0000)]
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev am:
ee28c8c22c
am:
d8e73720f6
Change-Id: I7a87357cbfe67ffbcd7cd6d9c5cf2a26250fb755
Christopher Tate [Thu, 6 Oct 2016 20:36:26 +0000 (20:36 +0000)]
Explicitly close FD binder parameters in backup/restore API calls am:
91bb0e5cca
am:
3fa99a6d11
Change-Id: I4789534da734abbce9ec52fcbe9a754bd7bd9fa0
Christopher Tate [Thu, 6 Oct 2016 20:35:44 +0000 (20:35 +0000)]
Eliminate unnecessary object churn in job scheduler updating
am:
eafb535072
Change-Id: I4b43ea727720e73ad11a0615c221fe23ca9d34c0
Phil Weaver [Thu, 6 Oct 2016 20:35:28 +0000 (20:35 +0000)]
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev am:
8051c9222e
am:
b88b084684
Change-Id: I952386834e47d2ec70055aa6223f6243ae16b365
Paul Stewart [Thu, 6 Oct 2016 20:34:32 +0000 (20:34 +0000)]
Merge "Tethering: check if configManager is null" into nyc-mr1-dev
am:
7d25ab7b11
Change-Id: I5ccb3d013d4adcdc7ec340da902fc4d3b3217d77
Phil Weaver [Thu, 6 Oct 2016 20:34:32 +0000 (20:34 +0000)]
Make magnification ignore invisible wallpaper. am:
473af05b82
am:
2de5ca2c65
Change-Id: I44e46afdec4da4e40cfd3d3d8262edb3156fb291
Rebecca Silberstein [Thu, 6 Oct 2016 20:34:26 +0000 (20:34 +0000)]
Tethering: check if configManager is null
am:
b07f140904
Change-Id: I71abfd9d6c91bbc3b3b2b3689756d3dd6818ac1e
Rob Carr [Thu, 6 Oct 2016 20:33:01 +0000 (20:33 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev
am:
c65dc5529e
Change-Id: Ib3cbf980a9779c5f9ff741ac9109a20bea549cb3
Robert Carr [Thu, 6 Oct 2016 20:32:54 +0000 (20:32 +0000)]
Prevent any rotation while seamless rotation is pending.
am:
b14d4abc16
Change-Id: Id6c19bec943592c5c39bdd75a563132650506151
Robert Carr [Thu, 6 Oct 2016 20:32:02 +0000 (20:32 +0000)]
Prevent triggering orientation changes until previous completes.
am:
45f6a2718a
Change-Id: I3a2a916d9e9d1eb38b990f8ea33201762298770c
Dianne Hackborn [Thu, 6 Oct 2016 20:31:28 +0000 (20:31 +0000)]
Merge "Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev am:
c26c98cd4a
am:
c361eb7c85
Change-Id: Ia024c0a762f6fbfc7079ab35f500c8b1eef98fe6
Jason Monk [Thu, 6 Oct 2016 20:30:49 +0000 (20:30 +0000)]
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev
am:
3523728e77
Change-Id: I17a43a11ce391249d6ae3c3066024ee04b09468f
Jason Monk [Thu, 6 Oct 2016 20:30:44 +0000 (20:30 +0000)]
QS: Don't set flashlight state when we don't have an id
am:
ad32c550c0
Change-Id: I222d528ff37cc835bbcb66eb650954c49e5af935
Dianne Hackborn [Thu, 6 Oct 2016 20:30:36 +0000 (20:30 +0000)]
Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service am:
eb909e3cda
am:
86e1f6f3e1
Change-Id: I1523c302115b0e8d1487f81feb125d393cbf6b3c
Lei Yu [Thu, 6 Oct 2016 20:29:00 +0000 (20:29 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev
am:
3fd73a645a
Change-Id: I0328ef193a3c8e5686529245dcd181f9fa47b391
jackqdyulei [Thu, 6 Oct 2016 20:26:45 +0000 (20:26 +0000)]
Add "FILTER_NOT_HIDE" to filter out the apps.
am:
4bf191ca75
Change-Id: I96ad716830dc857091b8f66c9631d217a95b70b4
Jim Miller [Thu, 6 Oct 2016 20:26:20 +0000 (20:26 +0000)]
Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev am:
bf79852ae4
am:
aa3e039ad7
Change-Id: I0891cf27dbe49ba18584e913d6a75b9223c10de4
Jim Miller [Thu, 6 Oct 2016 20:25:19 +0000 (20:25 +0000)]
Add metrics logging for critical fingerprintd errors am:
c57c8d934c
am:
71558c252b
Change-Id: I9eb3c9e7e8f0509a4e5c666d356388a1b272e710
Bill Yi [Thu, 6 Oct 2016 20:25:02 +0000 (20:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e03f970ab4 -s ours
Change-Id: Id98b3d6c2ced3b7734021533d8ff4acc24023acd
Bill Yi [Thu, 6 Oct 2016 20:24:55 +0000 (20:24 +0000)]
Import translations. DO NOT MERGE
am:
cf2df3bb6e -s ours
Change-Id: I52604a81767fbf9dd7aacb81daed530666836c67
Adarsh Fernando [Thu, 6 Oct 2016 20:24:14 +0000 (20:24 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder am:
1face37061 am:
5fe735fe2c am:
bce10d350d
am:
5e9c44497e
Change-Id: I02f7c8d2cf5b1c13e91fdd576edc7fe93bad827d
Bill Yi [Thu, 6 Oct 2016 20:23:51 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f22cb06b4d -s ours
Change-Id: Idc27632cf8baf85e2fcb39c34e4bfe2640c57646
Bill Yi [Thu, 6 Oct 2016 20:23:48 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
49baec862b -s ours
Change-Id: I16dbe5ccdda50634607e20c212d8c454974faba5
Bill Yi [Thu, 6 Oct 2016 20:23:14 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
b8e046a8a2 -s ours
am:
2f09527ec4 -s ours
Change-Id: Ia559a0124045302ccde7de2b65143ceb0769bcd7
Jorim Jaggi [Thu, 6 Oct 2016 20:22:39 +0000 (20:22 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev
am:
a92006ef6c
Change-Id: Iec8c618187b902a8837562f560bb661bd33aa569
Jorim Jaggi [Thu, 6 Oct 2016 20:22:36 +0000 (20:22 +0000)]
Reload state when user unlocks
am:
dadafd4109
Change-Id: I3480bdb8ea1a6f5a74f6a1a40a19634d53f86b00
Bill Yi [Thu, 6 Oct 2016 20:22:23 +0000 (20:22 +0000)]
Import translations. DO NOT MERGE am:
53edc8f204 -s ours
am:
1a7f727ffe -s ours
Change-Id: I29f80185040eacb12c6b236c1a16aa8aaa047ed4
Bill Yi [Thu, 6 Oct 2016 20:21:21 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a381e699e0 -s ours
am:
a51780e388 -s ours
Change-Id: I0aac0984657ea5ed22b53e5801b4578594f7c449
Lorenzo Colitti [Thu, 6 Oct 2016 20:20:27 +0000 (20:20 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am:
291af5c568
am:
80f15e3b4c
Change-Id: Id92e4d2d5236107f3d88bc300066bab747804be1
Bill Yi [Thu, 6 Oct 2016 20:20:27 +0000 (20:20 +0000)]
Import translations. DO NOT MERGE am:
453f915f94 -s ours
am:
094adbf23d -s ours
Change-Id: Ie910b9568c58f579112e6ba8e08a9ff71b8cc1c4
Bill Yi [Thu, 6 Oct 2016 20:19:37 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
8990b8c29c -s ours
am:
8ca1fcdeb7 -s ours
Change-Id: Ifae46ed2bfd502ae02718f33b14444525c91dc89
Lorenzo Colitti [Thu, 6 Oct 2016 20:19:36 +0000 (20:19 +0000)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. am:
f11ee9f592
am:
d2ad8ece53
Change-Id: Id152486610dd29d0839b06bcc45069643b0e335c
Bill Yi [Thu, 6 Oct 2016 20:18:41 +0000 (20:18 +0000)]
Import translations. DO NOT MERGE am:
d2671e488d -s ours
am:
d6f07c492c -s ours
Change-Id: I11003e9aef0af3c40cfe47ff2a78f6853c0edb99
Lorenzo Colitti [Thu, 6 Oct 2016 20:18:28 +0000 (20:18 +0000)]
Slightly simplify IpManager#compareProvisioning. am:
b77b775213
am:
fdac9b608b
Change-Id: Ia89fe49084e94a0299c54f55660b1cfa6a92cc7f
Erik Kline [Thu, 6 Oct 2016 20:17:45 +0000 (20:17 +0000)]
Conditionally accept loss of on-link IPv6 DNS servers am:
5b437d6ff9
am:
d719d95139
Change-Id: I19bf8a4251d03d2648972a820b365c1c3e4996e3
Erik Kline [Thu, 6 Oct 2016 20:16:57 +0000 (20:16 +0000)]
Refactor "avoid bad wifi" logic into a utility class am:
065ab6ee40
am:
23cdacbec6
Change-Id: Id670d13b99ab6935b67335e19d2389e5b4f61111
Doris Liu [Thu, 6 Oct 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev
am:
8d4c87b0bf
Change-Id: Id887a0665caab2d196e7e70c7c0c307d476da3ba
Doris Liu [Thu, 6 Oct 2016 20:15:40 +0000 (20:15 +0000)]
Restrict AVD and VD parsing to the current element instead of the whole document
am:
1f859716a8
Change-Id: Ic2fe385089997f89675be8f8a1559db979387dbb
Tenghui Zhu [Thu, 6 Oct 2016 20:14:28 +0000 (20:14 +0000)]
Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev
am:
99224b311c
Change-Id: If59f1d136a96dbfb83311f99f7e08dff8927e72d
Teng-Hui Zhu [Thu, 6 Oct 2016 20:14:23 +0000 (20:14 +0000)]
Update JavaDoc about animatable on VectorDrawable
am:
bb12929470
Change-Id: I476d1416b0f734fbc87895c22de3e95efdbf25b9
Hemal Patel [Thu, 6 Oct 2016 20:13:41 +0000 (20:13 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev am:
b4be5089f3 am:
14557acbfc am:
d7ef4228e2
am:
8ae777d632
Change-Id: I64c3bd8c7c8c2c5e8e91383ffd0bf2b4ed5e6b7c
Adam Lesinski [Thu, 6 Oct 2016 20:13:05 +0000 (20:13 +0000)]
Merge "Fix thread race caused double free issue." into nyc-mr1-dev
am:
68ec3695d0
Change-Id: I7b13469b249e5a159e3be9d1ee264f2616ebcd22
songjinshi [Thu, 6 Oct 2016 20:13:00 +0000 (20:13 +0000)]
Fix thread race caused double free issue.
am:
5754b41c20
Change-Id: Ic9dd6e9c6d216753d997da99158816682d5464d1
Hemal Patel [Thu, 6 Oct 2016 20:12:39 +0000 (20:12 +0000)]
Docs: Fixed the Service link am:
1918214589 am:
eb21088b67 am:
63b5e3ddd1
am:
435e8d8921
Change-Id: Ibd3d658f9375b711a35442b7800c223c0b6dc010
Bert McMeen [Thu, 6 Oct 2016 20:12:08 +0000 (20:12 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10 am:
19404c6f93
am:
20cf00152d
Change-Id: I55a7ee1cb4716de818d125bd168820838d323a17
Christopher Wiley [Thu, 6 Oct 2016 20:11:42 +0000 (20:11 +0000)]
Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev am:
fee635cc28
am:
6695d876ca
Change-Id: I2b1f9d57f6b754e517950d7faa373a182813fb6f
Chris Tate [Thu, 6 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev
am:
ee28c8c22c
Change-Id: I51884bab34d7e0bd33e19c8cdfd780572880f96f
Christopher Tate [Thu, 6 Oct 2016 20:10:56 +0000 (20:10 +0000)]
Explicitly close FD binder parameters in backup/restore API calls
am:
91bb0e5cca
Change-Id: Ibdba35d9c4e17180a7593966b4d54d6fb9c03f02
Christopher Wiley [Thu, 6 Oct 2016 20:10:38 +0000 (20:10 +0000)]
Implement untetherAll as calls to stopTethering am:
fa6a486615
am:
715a2142aa
Change-Id: I45f63ffee26ca9b935cdbfb107ebf4d28f362acd
Christopher Wiley [Thu, 6 Oct 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev am:
a6afc56f94
am:
f42c660ddd
Change-Id: I64f32a690fb7a4209abcc619c28b0d331f96add1
Phil Weaver [Thu, 6 Oct 2016 20:09:42 +0000 (20:09 +0000)]
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
am:
8051c9222e
Change-Id: I4d4338d71140773df82f89c4fa67dcf8ee004d4c
Phil Weaver [Thu, 6 Oct 2016 20:09:37 +0000 (20:09 +0000)]
Make magnification ignore invisible wallpaper.
am:
473af05b82
Change-Id: Ie40d7eda7b36d8613e1dd035d9446c4239e20193
Christopher Wiley [Thu, 6 Oct 2016 20:08:44 +0000 (20:08 +0000)]
Notify NetworkPolicyManagerService on tethering changes am:
deebfec90b
am:
5ca9c569c3
Change-Id: Ic1b99f8bbeffde72dd93d4879aa25954d0d98554
Dianne Hackborn [Thu, 6 Oct 2016 20:07:57 +0000 (20:07 +0000)]
Merge "Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev
am:
c26c98cd4a
Change-Id: I0024a7927ec686fd147ce5a1a477eb85c50e19a7
OSDN Git Service
