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

Android Build Merger (Role) [Tue, 18 Jul 2017 23:52:59 +0000 (23:52 +0000)]

Merge "Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 am: 6b0e6946c3 am: dbc78509ae" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Robert Quattlebaum [Tue, 18 Jul 2017 23:51:04 +0000 (23:51 +0000)]

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 am: 6b0e6946c3
am: dbc78509ae

Change-Id: I017036f8c63ea1e9c1934daad55ef087b3a83012

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 23:50:41 +0000 (23:50 +0000)]

Merge "Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7 am: 8e82bc9961 am: c3cc786404" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Billy Lam [Tue, 18 Jul 2017 23:49:35 +0000 (23:49 +0000)]

Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7 am: 8e82bc9961
am: c3cc786404

Change-Id: I5b23033e5481778e1e9f7d95a341bab985f6fa43

commit | commitdiff | tree

Roozbeh Pournader [Tue, 18 Jul 2017 23:48:47 +0000 (23:48 +0000)]

Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev
am: d5b776c721

Change-Id: I1d1cf56a6bda1cd23a422aeb0dd0a720044f4f46

commit | commitdiff | tree

Lorenzo Colitti [Tue, 18 Jul 2017 23:44:17 +0000 (23:44 +0000)]

resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master am: 8228eb3446
am: 6a5fe34edf -s ours

Change-Id: Ie520e145c7c97841ac36970c62633962eed8b30b

commit | commitdiff | tree

Robert Quattlebaum [Tue, 18 Jul 2017 23:43:46 +0000 (23:43 +0000)]

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22
am: 6b0e6946c3

Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8

commit | commitdiff | tree

Billy Lam [Tue, 18 Jul 2017 23:42:13 +0000 (23:42 +0000)]

Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7
am: 8e82bc9961

Change-Id: I4b9ecfcbe0e3757615ef4eca7602e4bf066a25e5

commit | commitdiff | tree

Lorenzo Colitti [Tue, 18 Jul 2017 23:37:57 +0000 (23:37 +0000)]

resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master
am: 8228eb3446

Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72

commit | commitdiff | tree

TreeHugger Robot [Tue, 18 Jul 2017 23:35:19 +0000 (23:35 +0000)]

Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev

commit | commitdiff | tree

Robert Quattlebaum [Tue, 18 Jul 2017 23:33:08 +0000 (23:33 +0000)]

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am: 777c408a22

Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad

commit | commitdiff | tree

Billy Lam [Tue, 18 Jul 2017 23:30:46 +0000 (23:30 +0000)]

Merge "GC in heapDumpFinished to cleanup hprof fd"
am: f126c41de7

Change-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0

commit | commitdiff | tree

Christine Franks [Tue, 18 Jul 2017 23:30:29 +0000 (23:30 +0000)]

Merge "Disable lock screen by default for demo users" into oc-dr1-dev
am: 205585e574

Change-Id: I05eeee1b997916e0f8fa86614aaac3d0e395a35c

commit | commitdiff | tree

Christine Franks [Tue, 18 Jul 2017 23:18:40 +0000 (23:18 +0000)]

Merge "Disable lock screen by default for demo users" into oc-dr1-dev

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:56:44 +0000 (22:56 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd am: 80c2eeedbb
am: f947a122cb

Change-Id: Iaa193ad64cee5d2d7f843d0b5ce4626035ebc090

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 22:53:48 +0000 (22:53 +0000)]

Merge "Merge "Fixed the text alignment with RTL text" into oc-dr1-dev am: 198218809e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Tue, 18 Jul 2017 22:50:31 +0000 (22:50 +0000)]

Merge "Fixed the text alignment with RTL text" into oc-dr1-dev
am: 198218809e

Change-Id: If4addbc49a299fbee7ccb23f84852897269475d3

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:45:45 +0000 (22:45 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours am: 442fc85852
am: fd3f7f3d71

Change-Id: I55a55467111057f2e136b0c59d5d24ae23bf2578

commit | commitdiff | tree

Selim Cinek [Tue, 18 Jul 2017 22:43:46 +0000 (22:43 +0000)]

Merge "Fixed the text alignment with RTL text" into oc-dr1-dev

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:41:23 +0000 (22:41 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd am: 80c2eeedbb
am: 40f47253fd

Change-Id: I8031af47f1d2a55a0ea2fd73cd782ca80ecd6cea

commit | commitdiff | tree

Lorenzo Colitti [Tue, 18 Jul 2017 21:17:33 +0000 (06:17 +0900)]

resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master

Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:35:06 +0000 (22:35 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd
am: 80c2eeedbb

Change-Id: I3183c725f1c8246481543832644518d5a2f566c0

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:33:34 +0000 (22:33 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd
am: 80c2eeedbb

Change-Id: Idf87c95beab3eb9030d0abeb2cf769e05b4a185d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 22:31:57 +0000 (22:31 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours am: 4607ec8f6d am: ad09c7e7d0" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Treehugger Robot [Tue, 18 Jul 2017 22:30:31 +0000 (22:30 +0000)]

Merge "GC in heapDumpFinished to cleanup hprof fd"

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 22:29:10 +0000 (22:29 +0000)]

Merge "Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours am: 442fc85852 am: 412614bcdf" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:28:02 +0000 (22:28 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours am: 4607ec8f6d
am: ad09c7e7d0

Change-Id: Ie350f5269916c26185a927778781e5de1e8d564e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:27:39 +0000 (22:27 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours am: 442fc85852
am: 412614bcdf

Change-Id: I30e5b309406a5dd59728fc5ec101ccdbd810064a

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35
am: 713a5420dd

Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:25:39 +0000 (22:25 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018 am: 3700014be0
am: b086ea50bb

Change-Id: I2e45ee8c02a879f534b925a859edb6475384a0c0

commit | commitdiff | tree

nharold [Tue, 18 Jul 2017 22:23:55 +0000 (22:23 +0000)]

Merge "Launch NetD in a different thread" am: c721dce3fc am: 709f3c1d46
am: cd3633fc01

Change-Id: Ifaaa918e1ade21609ef1615d9315c44d89a23a6d

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours
am: 442fc85852

Change-Id: I1486a19f77bde9af02b7dab6f06b80b6bf0940da

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390
am: fef2328f35

Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:15:41 +0000 (22:15 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours am: 4607ec8f6d
am: 2b57d28b4c

Change-Id: I8f29f74973582b0ec58ece2ddae423fd31cb06d6

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:08:34 +0000 (22:08 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours
am: 442fc85852

Change-Id: I2332b61077924a2c8c5cdad5f440acb856db4acf

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours
am: 2a93c3d390

Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de

commit | commitdiff | tree

Tom Cherry [Tue, 18 Jul 2017 22:03:32 +0000 (22:03 +0000)]

Merge "Remove ALOGD_IF_SLOW" am: b793aa8c81 -s ours am: 3ed109136c -s ours
am: 597556e119 -s ours

Change-Id: Ibfd28f001845c0ace0297e6d280c4d1a08e4106d

commit | commitdiff | tree

Neil Fuller [Tue, 18 Jul 2017 22:00:36 +0000 (22:00 +0000)]

Merge "Remove a TODO associate with starting a thread" am: c685e1e4a1 am: d61516d7b5
am: 70267e2d45

Change-Id: Ic8c18e74df95bbe8aeb26090a03e62c2dd80eea3

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7
am: cfbe89ad32 -s ours

Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:57:16 +0000 (21:57 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours
am: 4607ec8f6d

Change-Id: Ic51570a1b13563cd084cd03389d4cf7f2654df8b

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:57:14 +0000 (21:57 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours
am: 4607ec8f6d

Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
am: 4fa8b51c0c -s ours

Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 21:54:34 +0000 (21:54 +0000)]

Merge "Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40 am: 238be4a67b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Steven Moreland [Tue, 18 Jul 2017 21:51:49 +0000 (21:51 +0000)]

Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40
am: 238be4a67b

Change-Id: Icb75bc6c2ba9750349de0e4f0ea15c29b5502b7b

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:51:00 +0000 (21:51 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018 am: 3700014be0
am: df6486e37f

Change-Id: Id106d8c3d4e805003eec8f8e9e1eb8c8f681a5a6

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f
am: ac700bc3c7

Change-Id: If57bab0ee9d5459286339845284adb3f0163c401

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a
am: 982cf0d212 -s ours

Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev
am: 0b0834fbe8

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:44:01 +0000 (21:44 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018
am: 3700014be0

Change-Id: Id7dbefd2586c25730efc719bd787cdf70c98c7f0

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db
am: d2c4007d8a

Change-Id: I9c749eb931db880073de06259232f5f03c91cd32

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c
am: b2e3fb162f

Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:31:32 +0000 (21:31 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018
am: 3700014be0

Change-Id: I4d831e16f45fd2855a257551fa55182147b7bf2e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f
am: faded53018

Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f
am: 27ad1fbc2c

Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69
am: 783253f6db

Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev

commit | commitdiff | tree

Roozbeh Pournader [Tue, 18 Jul 2017 21:22:40 +0000 (14:22 -0700)]

Remove Tigrinya (ti) from Settings languages

Tigrinya does not have any localized country names for ER (Eritrea)
and ET (Ethiopia), which the user would need to choose if they choose
Tigrinya. Removing from user selectable languages until CLDR/ICU
adds more data.

Change-Id: Iaa7f702db0bb8749a4bdc2e88b03e5ea8590bad9
Fixes: 63807177
Test: Manual (Tigrinya is no longer shown in Settings)

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957
am: 79c476704f

Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours
am: bbb567757f

Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae
am: aa8976fa69

Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e
am: a1dca32957

Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours
am: f44b48acae

Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c
am: b968d99e3e

Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d
am: cf7ce06abd -s ours

Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4
am: 5264237c94

Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89
am: 83261a8b5c

Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed
am: 62eca82f89

Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb
am: f05a6fc52d

Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c
am: 68f7106cf4

Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e
am: e11e076fed

Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240
am: 219d9b5dfb

Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours
am: 5d46833d9c

Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5
am: e06843fe7e

Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours
am: 76007bb240

Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2

commit | commitdiff | tree

Billy Lam [Tue, 18 Jul 2017 19:01:44 +0000 (12:01 -0700)]

GC in heapDumpFinished to cleanup hprof fd

Previously the fd associated with the dump file was
not closed until the next GC. While this did not
affect AMS, external systems relying on monitoring
the close event on the file could not accurately
know when a dump operation was finished.

Bug: 62907010
Test: Manually flashed and tested

Change-Id: I0f6988099f479468f674eb7483f1f14529852270

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours
am: 68efc2e5b5

Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e
am: 37cf6265db -s ours

Change-Id: I28f848331e5379736dd777995fe844aa5c5df689

commit | commitdiff | tree

nharold [Tue, 18 Jul 2017 20:29:07 +0000 (20:29 +0000)]

Merge "Launch NetD in a different thread" am: c721dce3fc
am: 709f3c1d46

Change-Id: Id0a51ae3563a4956c4f81174883b43c64bdac892

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1
am: ccbac7e9e0 -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6
am: 3c4d24923c -s ours

Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f

commit | commitdiff | tree

Lucas Dupin [Tue, 18 Jul 2017 20:24:53 +0000 (20:24 +0000)]

Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am: bc907cf9a8

Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05

commit | commitdiff | tree

Tom Cherry [Tue, 18 Jul 2017 20:23:13 +0000 (20:23 +0000)]

Merge "Remove ALOGD_IF_SLOW" am: b793aa8c81 -s ours
am: 3ed109136c -s ours

Change-Id: I50d0afc6af9a7462abf836e2dc5a9072b71c288b

commit | commitdiff | tree

Neil Fuller [Tue, 18 Jul 2017 20:21:07 +0000 (20:21 +0000)]

Merge "Remove a TODO associate with starting a thread" am: c685e1e4a1
am: d61516d7b5

Change-Id: Ia2b6fd41e3a804ec9c6e5238f6ba53495de764e9

commit | commitdiff | tree

nharold [Tue, 18 Jul 2017 20:18:10 +0000 (20:18 +0000)]

Merge "Launch NetD in a different thread"
am: c721dce3fc

Change-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2

commit | commitdiff | tree

Steven Moreland [Tue, 18 Jul 2017 20:15:54 +0000 (20:15 +0000)]

Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5
am: d2bf323c40

Change-Id: I8bf7c9505ed31d0e248775455c0a88c836af2754

commit | commitdiff | tree

Tom Cherry [Tue, 18 Jul 2017 20:13:25 +0000 (20:13 +0000)]

Merge "Remove ALOGD_IF_SLOW"
am: b793aa8c81 -s ours

Change-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7

commit | commitdiff | tree

Neil Fuller [Tue, 18 Jul 2017 20:09:26 +0000 (20:09 +0000)]

Merge "Remove a TODO associate with starting a thread"
am: c685e1e4a1

Change-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25

commit | commitdiff | tree

TreeHugger Robot [Tue, 18 Jul 2017 20:08:58 +0000 (20:08 +0000)]

Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev

commit | commitdiff | tree

Steven Moreland [Tue, 18 Jul 2017 20:05:36 +0000 (20:05 +0000)]

Merge "Reference nativehelper/jni.h as jni.h"
am: 899a1f23c5

Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62

commit | commitdiff | tree

Daniel Nishi [Tue, 18 Jul 2017 19:44:33 +0000 (19:44 +0000)]

Merge "Add home activity methods to wrapper." into oc-dr1-dev
am: d332076636

Change-Id: I623d431fe052649ee2bf80a6ab459f6424f7e9e0

commit | commitdiff | tree

Rob Carr [Tue, 18 Jul 2017 19:39:46 +0000 (19:39 +0000)]

Merge "Fix rotation animation selection." into oc-dr1-dev
am: cee8098178

Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 18 Jul 2017 19:38:18 +0000 (19:38 +0000)]

Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
am: f80ec1583d

Change-Id: Id03863d7f6bb6a10ac82c504c3c64227e7286cd6

commit | commitdiff | tree

Daniel Nishi [Tue, 18 Jul 2017 19:34:42 +0000 (19:34 +0000)]

Merge "Add home activity methods to wrapper." into oc-dr1-dev

commit | commitdiff | tree

Rob Carr [Tue, 18 Jul 2017 19:31:00 +0000 (19:31 +0000)]

Merge "Fix rotation animation selection." into oc-dr1-dev

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 18 Jul 2017 19:30:28 +0000 (19:30 +0000)]

Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev

commit | commitdiff | tree

Lorenzo Colitti [Tue, 18 Jul 2017 18:45:29 +0000 (18:45 +0000)]

Merge changes from topic 'tether-offload-cherrypick'

* changes:
  Add code to dump OffloadController state.
  Fetch tethering offload stats.
  Allow more than one source of tethering statistics.

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours
am: 954deb1c6e

Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
am: a620b21828 -s ours

Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf