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

Tenghui Zhu [Fri, 7 Oct 2016 01:01:21 +0000 (01:01 +0000)]

Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev am: 99224b311c am: 3445b58a6d
am: a07f03ea92

Change-Id: I47a441ebd926c44e397d1869519cfbb959ef286b

commit | commitdiff | tree

Teng-Hui Zhu [Fri, 7 Oct 2016 01:00:32 +0000 (01:00 +0000)]

Update JavaDoc about animatable on VectorDrawable am: bb12929470 am: 8bf7fd89e7
am: a504e12e25

Change-Id: I8b97f242a22e763e23169b9cb55d87afd2a6f471

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Oct 2016 00:59:36 +0000 (00:59 +0000)]

Merge "Fix thread race caused double free issue." into nyc-mr1-dev am: 68ec3695d0 am: a2b5c8a912
am: 157d864264

Change-Id: I8d2bf30740b89e49a59927a867be2334aeb5b608

commit | commitdiff | tree

songjinshi [Fri, 7 Oct 2016 00:58:43 +0000 (00:58 +0000)]

Fix thread race caused double free issue. am: 5754b41c20 am: 09901f3bc9
am: 995c7a410b

Change-Id: I5bf330035a01e4f94235561342bc942142d9f007

commit | commitdiff | tree

Bert McMeen [Fri, 7 Oct 2016 00:57:55 +0000 (00:57 +0000)]

Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10 am: 19404c6f93 am: 20cf00152d am: c9956e2ea8
am: 3da2d04626

Change-Id: Id4e48d9f7b77134505b2ca9a7b16fe42458e051c

commit | commitdiff | tree

Chris Tate [Fri, 7 Oct 2016 00:56:58 +0000 (00:56 +0000)]

Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev am: ee28c8c22c am: d8e73720f6
am: 22795dad96

Change-Id: Ida74bfdc0ead02a0307407d94b647bb8c65bad97

commit | commitdiff | tree

Christopher Tate [Fri, 7 Oct 2016 00:56:11 +0000 (00:56 +0000)]

Explicitly close FD binder parameters in backup/restore API calls am: 91bb0e5cca am: 3fa99a6d11
am: 79a3ee5a98

Change-Id: Idc4ae96cf8237bd6439604476d7f5e7887cb8655

commit | commitdiff | tree

Phil Weaver [Fri, 7 Oct 2016 00:55:20 +0000 (00:55 +0000)]

Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev am: 8051c9222e am: b88b084684
am: 5e59b7ea1d

Change-Id: I7b6edd488ca42765ece7e0f14d2f6c6dde5363e5

commit | commitdiff | tree

Phil Weaver [Fri, 7 Oct 2016 00:54:20 +0000 (00:54 +0000)]

Make magnification ignore invisible wallpaper. am: 473af05b82 am: 2de5ca2c65
am: 5a48cf3aa1

Change-Id: I72d6ec29c5c1b39c386281b9edaeb12874a49f09

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Oct 2016 00:52:45 +0000 (00:52 +0000)]

Merge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev am: c26c98cd4a am: c361eb7c85
am: 77a93d6045

Change-Id: I15d3e1fb364791a5bb1bfd16be88dc307772d72e

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Oct 2016 00:51:34 +0000 (00:51 +0000)]

Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service am: eb909e3cda am: 86e1f6f3e1
am: 4d59e2454e

Change-Id: I9284a4d10f9364e3bb0f1485a2c6ae7c253a7d57

commit | commitdiff | tree

Jim Miller [Fri, 7 Oct 2016 00:50:33 +0000 (00:50 +0000)]

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

Change-Id: I520b96c0b8d130069e7752ca4716936b160a5e7a

commit | commitdiff | tree

Jim Miller [Fri, 7 Oct 2016 00:49:38 +0000 (00:49 +0000)]

Add metrics logging for critical fingerprintd errors am: c57c8d934c am: 71558c252b
am: 8b9e1d0026

Change-Id: Ic322a7a62987efd8c3091c5819ec2ffcb02b94fe

commit | commitdiff | tree

Adarsh Fernando [Fri, 7 Oct 2016 00:48:48 +0000 (00:48 +0000)]

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

Change-Id: I00e39f4d3ac11b5a373ef3f81b562c169ca0b342

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:47:52 +0000 (00:47 +0000)]

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

Change-Id: I46e7e9d0d61096e54ace2099920a411f58e8a6df

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:46:58 +0000 (00:46 +0000)]

Import translations. DO NOT MERGE am: 53edc8f204 -s ours am: 1a7f727ffe -s ours
am: 58c586616b -s ours

Change-Id: I40944a75406e99b30b688c52279a8c0dc0f4513d

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:45:59 +0000 (00:45 +0000)]

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

Change-Id: I9ee9ccebfdbfb135e3e0b86ab39330f7a23a3d0e

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:45:03 +0000 (00:45 +0000)]

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

Change-Id: I78651fc68b1591f64f0ce0b3fad474c8935b937c

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:44:12 +0000 (00:44 +0000)]

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

Change-Id: Id83411d2b4822e0ff15e4aee9d61a0f998c73f87

commit | commitdiff | tree

Bill Yi [Fri, 7 Oct 2016 00:43:22 +0000 (00:43 +0000)]

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

Change-Id: If24e2560ef0eaf3020640659344985c8bdae56cc

commit | commitdiff | tree

Hemal Patel [Fri, 7 Oct 2016 00:42:31 +0000 (00:42 +0000)]

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

Change-Id: I28584b20f0cb6ac15fded84cba05c5d4e876acfa

commit | commitdiff | tree

Hemal Patel [Fri, 7 Oct 2016 00:41:36 +0000 (00:41 +0000)]

Docs: Fixed the Service link am: 1918214589 am: eb21088b67 am: 63b5e3ddd1 am: 435e8d8921
am: caa58260de

Change-Id: Ieb320cb06a9099c84b9410aca767b48ef322f327

commit | commitdiff | tree

Christopher Wiley [Fri, 7 Oct 2016 00:40:18 +0000 (00:40 +0000)]

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

Change-Id: I5eed2f2f5b6ce06b616390bf494ef3dafd85578f

commit | commitdiff | tree

Christopher Wiley [Fri, 7 Oct 2016 00:39:10 +0000 (00:39 +0000)]

Implement untetherAll as calls to stopTethering am: fa6a486615 am: 715a2142aa
am: 6618f5766c

Change-Id: Ib08d8a07fd52a140688c5e7f687ea73abb9186eb

commit | commitdiff | tree

Christopher Wiley [Fri, 7 Oct 2016 00:38:13 +0000 (00:38 +0000)]

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

Change-Id: I5501a87c2557ea2b67580042274c4ef8fec40976

commit | commitdiff | tree

Christopher Wiley [Fri, 7 Oct 2016 00:37:04 +0000 (00:37 +0000)]

Notify NetworkPolicyManagerService on tethering changes am: deebfec90b am: 5ca9c569c3
am: e15d7ee438

Change-Id: I063450c82f80f137cd130d384134a83820d8f084

commit | commitdiff | tree

Philip P. Moltmann [Fri, 7 Oct 2016 00:35:09 +0000 (00:35 +0000)]

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

Change-Id: Ia5c4551b854fb0f04eaad06740ce0f97832d9219

commit | commitdiff | tree

Philip P. Moltmann [Fri, 7 Oct 2016 00:34:03 +0000 (00:34 +0000)]

Do not access MTP devices when disabled. am: 5201f1e61c am: c950703424
am: 7db3055bba -s ours

Change-Id: Icfca091e8c793ecd0e0bcf7c519fb25775b297c6

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Oct 2016 22:32:21 +0000 (22:32 +0000)]

Merge "remove peekPackageLPr"

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

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

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

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: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

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

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

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

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

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

Change-Id: If20ebb553ae63a7ad8ef25ddb81f95e38de4fd68

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

Nimrod Gileadi [Thu, 6 Oct 2016 20:04:32 +0000 (20:04 +0000)]

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

Change-Id: Ia169a8a4db36229638997d5a09b86fe964d0c533

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

TreeHugger Robot [Thu, 6 Oct 2016 19:27:36 +0000 (19:27 +0000)]

Merge "Break up scanPackageDirtyLI"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Oct 2016 19:12:56 +0000 (19:12 +0000)]

Merge "Add findPath API to SAF."

commit | commitdiff | tree

Todd Kennedy [Thu, 6 Oct 2016 18:27:07 +0000 (11:27 -0700)]

remove peekPackageLPr

no longer needed, so, removed

Bug: 30219944
Change-Id: I0cf8ef4e8e2abc1d98b1f584ae448f9097095c6d
Test: adb shell am instrument -w -e class com.android.server.pm.PackageManagerSettingsTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

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

TreeHugger Robot [Thu, 6 Oct 2016 18:08:11 +0000 (18:08 +0000)]

Merge "Add a temporary activity-alias for TunerActivity."

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 18:04:25 +0000 (18:04 +0000)]

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

Change-Id: I79560200eeeff85bbf2f3468feca9805e1eb8217

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

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 17:48:57 +0000 (17:48 +0000)]

Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0 am: dfd9e7637e
am: 813f48e968

Change-Id: I4a7818fa8a3d67aeb31840a8d4ad22684d16e576

commit | commitdiff | tree

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

Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0
am: dfd9e7637e

Change-Id: I7f8439ef2659288c17df867f97a8185ad7b2db0d