git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Thu, 6 Oct 2016 20:22:36 +0000 (20:22 +0000)]

Reload state when user unlocks
am: dadafd4109

Change-Id: I3480bdb8ea1a6f5a74f6a1a40a19634d53f86b00

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lorenzo Colitti [Thu, 6 Oct 2016 20:18:28 +0000 (20:18 +0000)]

Slightly simplify IpManager#compareProvisioning. am: b77b775213
am: fdac9b608b

Change-Id: Ia89fe49084e94a0299c54f55660b1cfa6a92cc7f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

songjinshi [Thu, 6 Oct 2016 20:13:00 +0000 (20:13 +0000)]

Fix thread race caused double free issue.
am: 5754b41c20

Change-Id: Ic9dd6e9c6d216753d997da99158816682d5464d1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Phil Weaver [Thu, 6 Oct 2016 20:09:37 +0000 (20:09 +0000)]

Make magnification ignore invisible wallpaper.
am: 473af05b82

Change-Id: Ie40d7eda7b36d8613e1dd035d9446c4239e20193

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:07:41 +0000 (20:07 +0000)]

Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service
am: eb909e3cda

Change-Id: Ibbc6447d97c54b7393e557a831f0767edaea9b40

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 20:07:02 +0000 (20:07 +0000)]

Merge "Do not access MTP devices when disabled." into nyc-mr1-dev am: a40092d6d2
am: d22a1d66d8

Change-Id: I5669f78107fba42ee1d332d504b4c077c39bba2c

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:06:21 +0000 (20:06 +0000)]

Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev
am: bf79852ae4

Change-Id: I30f7db6cb9cd4cbb166402e0778591574cac27da

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:06:16 +0000 (20:06 +0000)]

Add metrics logging for critical fingerprintd errors
am: c57c8d934c

Change-Id: I7da4ef8b31bced6330656b2d4555d8e179ed4ddf

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 20:05:48 +0000 (20:05 +0000)]

Do not access MTP devices when disabled. am: 5201f1e61c
am: c950703424

Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b

commit | commitdiff | tree

Adarsh Fernando [Thu, 6 Oct 2016 20:05:26 +0000 (20:05 +0000)]

Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061 am: 5fe735fe2c
am: bce10d350d

Change-Id: I370104a076b8382a353065201fc0603b08081229

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:04:43 +0000 (20:04 +0000)]

Merge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev am: 531c0237fc
am: 726c7a5200

Change-Id: I4408669b6d4a618f595a254cd80ba6e849dc795d

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:04:09 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b8e046a8a2 -s ours

Change-Id: I7a06f41a928e47341a0767a0c65d2c45af6ddef6

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:04:06 +0000 (20:04 +0000)]

Import translations. DO NOT MERGE
am: 53edc8f204 -s ours

Change-Id: Ibc030ab4cd2881cfe500ce7be8b7477b7a352e2d

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:02:51 +0000 (20:02 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a381e699e0 -s ours

Change-Id: Ia7869d0fcde0a98cb706ac10836bad8d02f54272

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:02:48 +0000 (20:02 +0000)]

Import translations. DO NOT MERGE
am: 453f915f94 -s ours

Change-Id: Ibc356ceb2016c7a7c6abfccb5db7b3bcdc11d2ee

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:01:33 +0000 (20:01 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8990b8c29c -s ours

Change-Id: Iad921d79917548c8f38f68b78a6b09c84eff0cec

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:01:30 +0000 (20:01 +0000)]

Import translations. DO NOT MERGE
am: d2671e488d -s ours

Change-Id: I0b6000ab626e0aba864bb9b5ec182c338fba6de3

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 20:00:46 +0000 (20:00 +0000)]

Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3 am: 14557acbfc
am: d7ef4228e2

Change-Id: I70f2cbd4333eacbf239183b845816b8e3fb1150b

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 19:59:53 +0000 (19:59 +0000)]

Docs: Fixed the Service link am: 1918214589 am: eb21088b67
am: 63b5e3ddd1

Change-Id: I1b1d34bb84a66c35268a7db754e5465b4c2b8d30

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:58:38 +0000 (19:58 +0000)]

Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev
am: fee635cc28

Change-Id: Id16b45b6340d9018ecf90f066b65574a02735c33

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:58:33 +0000 (19:58 +0000)]

Implement untetherAll as calls to stopTethering
am: fa6a486615

Change-Id: I20abc6e267bf38208e9f76f173a9fb584749c4f5

commit | commitdiff | tree

Nimrod Gileadi [Thu, 6 Oct 2016 19:58:09 +0000 (19:58 +0000)]

resolve merge conflicts of 448489a to cw-f-dev
am: f2122f5f96

Change-Id: I9e8069d3e74399ed5c47da3b7a74a5c70702c0a8

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:57:19 +0000 (19:57 +0000)]

Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev
am: a6afc56f94

Change-Id: I1f67dc626f9f84894b1696c308a546f7f103b891

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:57:15 +0000 (19:57 +0000)]

Notify NetworkPolicyManagerService on tethering changes
am: deebfec90b

Change-Id: I43b25305c730966da83acdaccb127c27be0e2332

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 19:55:48 +0000 (19:55 +0000)]

Merge "Do not access MTP devices when disabled." into nyc-mr1-dev
am: a40092d6d2

Change-Id: Ic036b736f9368ef4fc207f16a8e2c23feef77305

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 19:55:28 +0000 (19:55 +0000)]

Do not access MTP devices when disabled.
am: 5201f1e61c

Change-Id: I9aa036678f2677054666b137533e61eaeac88159

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 19:54:30 +0000 (19:54 +0000)]

Merge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev
am: 531c0237fc

Change-Id: Idbf5ea191fa9ccdacad76f5c3951b31ccb203b6a

commit | commitdiff | tree

Nimrod Gileadi [Thu, 6 Oct 2016 18:25:11 +0000 (19:25 +0100)]

resolve merge conflicts of 448489a to cw-f-dev

Change-Id: Idaff9ccaf74bf0ec82c6346eb383295b508c7324

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 17:58:25 +0000 (17:58 +0000)]

Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424
am: 9515f91d9e

Change-Id: Ie62a95760cefb678a5c53c9c394ee80e226563eb

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 17:53:15 +0000 (17:53 +0000)]

Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b
am: c1beaa3424

Change-Id: I2eab4d515d9f879ecf7d8d6d78cce6c9b336786b

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help