OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev am...
Philipp Weiß [Wed, 14 Jun 2017 19:24:58 +0000 (19:24 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev am: 08836ed404
am: 90b4e175e3

Change-Id: If459d7a7f229b81e9f45c4c8e0c460b9077ec677

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 517503d1dd
Philip P. Moltmann [Wed, 14 Jun 2017 19:22:35 +0000 (19:22 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 517503d1dd
am: 2f291c3b84

Change-Id: I4fdf5d3de67bfbff6f89f523c7cd07aed706d90b

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 955aead48d
Philip P. Moltmann [Wed, 14 Jun 2017 19:07:01 +0000 (19:07 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 955aead48d
am: e993a709ce

Change-Id: I655c9b8ad44aed44cc0de245150625aaeed5df6d

7 years agoMerge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd...
Jason Monk [Wed, 14 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: adfc1ad840" into oc-dr1-dev-plus-aosp
am: 7a2bd51250

Change-Id: I472c0d677f21291a3940628f3712fb3fbba009fd

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am...
Jason Monk [Wed, 14 Jun 2017 18:56:47 +0000 (18:56 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: 2cb53750ec
am: b9bd54fbc3

Change-Id: I40cdba29fd007bdc0899ce545db9021607ce2599

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev am: f3ad1dbcfd
Jason Monk [Wed, 14 Jun 2017 18:53:01 +0000 (18:53 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev am: f3ad1dbcfd
am: 9dd35ba87b  -s ours

Change-Id: Ic71b0ee399625ddbab7288cf6515e5b7696b7d64

7 years agoMerge "Some cleanups in VolumeDialogImpl class 1. Get rid of unused imports 2. Make...
Rajeev Kumar [Wed, 14 Jun 2017 17:18:05 +0000 (17:18 +0000)]
Merge "Some cleanups in VolumeDialogImpl class 1. Get rid of unused imports 2. Make the an instance variable final 3. Fix typo in method name"

7 years agoMerge "Fix broadcast radio instrumentation tests."
Tomasz Wasilczyk [Wed, 14 Jun 2017 16:32:02 +0000 (16:32 +0000)]
Merge "Fix broadcast radio instrumentation tests."

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:23:17 +0000 (15:23 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
am: 08836ed404

Change-Id: Ia1c7d6110c8195b9480f8fdac9c5125e9a2395a5

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:16:48 +0000 (15:16 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003
Philip P. Moltmann [Wed, 14 Jun 2017 15:11:45 +0000 (15:11 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003
am: 517503d1dd

Change-Id: I2703a8ca505ba9be595c83d1b7c74ef3b824762c

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003
Philip P. Moltmann [Wed, 14 Jun 2017 15:03:42 +0000 (15:03 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003
am: 955aead48d

Change-Id: Ie7ea8573c00506a035a1eb61bdff7f66780e27ce

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:18 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am: 890cb59003

Change-Id: Id04b03520dfe63f5b11ee5b17841165a477a8f79

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:13 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am: 890cb59003

Change-Id: I5393dde07ea3feff2053d85769eccd5195139229

7 years agoMerge "Fixed flaky test"
Lucas Dupin [Wed, 14 Jun 2017 14:50:02 +0000 (14:50 +0000)]
Merge "Fixed flaky test"

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:44:30 +0000 (14:44 +0000)]
Merge "Select the right pages to scrap" into oc-dev

7 years agoMerge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd...
Android Build Merger (Role) [Wed, 14 Jun 2017 13:58:54 +0000 (13:58 +0000)]
Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: adfc1ad840" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
Jason Monk [Wed, 14 Jun 2017 13:56:46 +0000 (13:56 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
am: adfc1ad840

Change-Id: I57cd3a2694ce39f9e66d836d683b7d72b37ac766

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
Jason Monk [Wed, 14 Jun 2017 13:55:04 +0000 (13:55 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
am: 2cb53750ec

Change-Id: I02b42acfc44c732f9c7d67a1bf65e2714b3d714a

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev
Jason Monk [Wed, 14 Jun 2017 13:47:43 +0000 (13:47 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev
am: f3ad1dbcfd

Change-Id: Id1d9e70e14eecaa4f6c016aa1985e3a3f3170bc7

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac545
Grace Chen [Wed, 14 Jun 2017 13:47:42 +0000 (13:47 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac545
am: d09386a664

Change-Id: I9ae15ef2270314c9fbfcac110c97857b229e4804

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:17 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am: 2a0b423cd4

Change-Id: Ic8ce2331b9191422f921834f484492bc7bff4c95

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:11 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am: 2a0b423cd4

Change-Id: I97266821c07fd307dbe04e5d715792e57bfa9c0d

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:40:46 +0000 (13:40 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
am: 356d1ac545

Change-Id: I692e3d0d7eac1f94e39e85e4b244fd9974fc1108

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:37:28 +0000 (13:37 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev
Jason Monk [Wed, 14 Jun 2017 13:36:38 +0000 (13:36 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:35:34 +0000 (13:35 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:38:57 +0000 (10:38 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82 am: 35728f01cb am: d2bf55e300
am: 607df03ae0

Change-Id: Ib6e6356e6caa469523fc098e850108de97b494e2

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:32:29 +0000 (10:32 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82 am: 35728f01cb
am: d2bf55e300

Change-Id: Iec52309a56dd38ac9854ce40a792b3b622f0b015

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:25:33 +0000 (10:25 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82
am: 35728f01cb

Change-Id: I5eb3c02331aabc033ecfebee2900477c61e1b6f6

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
Erik Kline [Wed, 14 Jun 2017 10:19:35 +0000 (10:19 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
am: 6f029bbc82

Change-Id: I098bd78d29cf4119208d24977dab8494d3bf5fdb

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
Treehugger Robot [Wed, 14 Jun 2017 10:11:58 +0000 (10:11 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"

7 years agoUse SystemUI Dialog Theme for QSSecurityFooter dialog
phweiss [Tue, 13 Jun 2017 13:23:13 +0000 (15:23 +0200)]
Use SystemUI Dialog Theme for QSSecurityFooter dialog

Without the ContextThemeWrapper, the dialog's text color
gets changed whenever the QS theme changes.

Bug: 62534577
Test: manual, CTS Verifier > Managed Provisioning > Device Owner Tests
      > Network Logging UI

Change-Id: I408902688b97bb3c6dff06215b12956ae49a4806
(cherry picked from commit da9bee2623c358913cafc06b6d617d10e234777c)

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog"
Philipp Weiß [Wed, 14 Jun 2017 10:00:54 +0000 (10:00 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog"

7 years agoMerge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:...
Peng Xu [Wed, 14 Jun 2017 06:44:34 +0000 (06:44 +0000)]
Merge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 41cb9f1bb1" into oc-dr1-dev-plus-aosp
am: 0aeac3814a

Change-Id: Ica523e0d2b851e87d4520d32e70672416836afc9

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8...
Peng Xu [Wed, 14 Jun 2017 06:36:20 +0000 (06:36 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 308aa4c846
am: 5c2479c7ab

Change-Id: If26280f5a68bc859a0f06ae18d3eb0bb8b2ea57c

7 years agoMerge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:...
Android Build Merger (Role) [Wed, 14 Jun 2017 06:33:43 +0000 (06:33 +0000)]
Merge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 41cb9f1bb1" into oc-dr1-dev-plus-aosp

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
Peng Xu [Wed, 14 Jun 2017 06:31:51 +0000 (06:31 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
am: 41cb9f1bb1

Change-Id: I26fbfe8ae684fe27c43fcad12ff127506614e0b9

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
Peng Xu [Wed, 14 Jun 2017 06:27:45 +0000 (06:27 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
am: 308aa4c846

Change-Id: I90935ea2db530143daf3da44637b7cb97f9be2bd

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am: d27d5d9ea8

Change-Id: Ib34a45b6fe35f27f4b3093888cbecd70b8b71300

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am: d27d5d9ea8

Change-Id: Iecea6df9119b4a9bbd5843e78787d581ced518c7

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev

7 years agoApp launch test apk change am: 0a2c9396a2 am: 8c64bf0edf
gopinath [Wed, 14 Jun 2017 05:01:04 +0000 (05:01 +0000)]
App launch test apk change am: 0a2c9396a2 am: 8c64bf0edf
am: a88f25b646

Change-Id: Ic6d3f9e6d920a0666104b82b79370f6ba715f1a3

7 years agoApp launch test apk change am: 0a2c9396a2 am: 4c81f3d412
gopinath [Wed, 14 Jun 2017 04:52:38 +0000 (04:52 +0000)]
App launch test apk change am: 0a2c9396a2 am: 4c81f3d412
am: 75b74a9056

Change-Id: Ifd74250be7b1372fe1449ac1fa55442293bfb829

7 years agoApp launch test apk change am: 0a2c9396a2
gopinath [Wed, 14 Jun 2017 04:49:30 +0000 (04:49 +0000)]
App launch test apk change am: 0a2c9396a2
am: 8c64bf0edf

Change-Id: Ia90bdb8649c55d271a68d6c831dbd59cd8a4a21f

7 years agoApp launch test apk change am: 0a2c9396a2
gopinath [Wed, 14 Jun 2017 04:45:04 +0000 (04:45 +0000)]
App launch test apk change am: 0a2c9396a2
am: 4c81f3d412

Change-Id: I6eab0fc584667f63dfa14de51f0c66b5494fb0f6

7 years agoApp launch test apk change
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am: 0a2c9396a2

Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305

7 years agoApp launch test apk change
gopinath [Wed, 14 Jun 2017 04:37:29 +0000 (04:37 +0000)]
App launch test apk change
am: 0a2c9396a2

Change-Id: Icad70c318aecfa28b985b7a7c737e332c9024ab8

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1...
Ying Xu [Wed, 14 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1 am: aaca44229b
am: 830b8ecab2

Change-Id: If2953e4ee5220809fdab50ddd4fc17c6ed80c3b4

7 years agoSome cleanups in VolumeDialogImpl class
Rajeev Kumar [Wed, 14 Jun 2017 02:41:35 +0000 (19:41 -0700)]
Some cleanups in VolumeDialogImpl class
1. Get rid of unused imports
2. Make the an instance variable final
3. Fix typo in method name

Change-Id: Ife7d84e8d60262153ac8bdb602565c526297b134

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1
Ying Xu [Wed, 14 Jun 2017 02:41:26 +0000 (02:41 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1
am: aaca44229b

Change-Id: I9656821a325d000dde93e05987c29c76609578bc

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
am: 707dc81da1

Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am: 70373f7928

Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"

7 years agoMerge "Disable StatusBar logs" into oc-dr1-dev am: 2306a78963
Lucas Dupin [Wed, 14 Jun 2017 02:15:18 +0000 (02:15 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev am: 2306a78963
am: 3d41a8df31

Change-Id: Ia710e1720c6c08d90dbf7581f9916eb1767fbfd9

7 years agoMerge "Disable StatusBar logs" into oc-dr1-dev
Lucas Dupin [Wed, 14 Jun 2017 02:07:59 +0000 (02:07 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
am: 2306a78963

Change-Id: Id542cb75499e2e1616e35ba067a431e3402a1f44

7 years agoMerge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba
Kevin Chyn [Wed, 14 Jun 2017 02:00:29 +0000 (02:00 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba
am: 3164bf6743

Change-Id: I30ba4eac86bc92ac8013840f80a3645efba64d3e

7 years agoMerge "Disable StatusBar logs" into oc-dr1-dev
TreeHugger Robot [Wed, 14 Jun 2017 01:57:53 +0000 (01:57 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev

7 years agoMerge "Add assist gesture silence and wake settings" into oc-dr1-dev
Kevin Chyn [Wed, 14 Jun 2017 01:53:02 +0000 (01:53 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
am: 6eacc1a4ba

Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7

7 years agoMerge "Add assist gesture silence and wake settings" into oc-dr1-dev
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev

7 years agoMerge "Expose USER_SETUP_COMPLETE as Test API."
TreeHugger Robot [Wed, 14 Jun 2017 01:37:28 +0000 (01:37 +0000)]
Merge "Expose USER_SETUP_COMPLETE as Test API."

7 years agoMerge "protect mIsolatedPackages access"
TreeHugger Robot [Wed, 14 Jun 2017 01:23:06 +0000 (01:23 +0000)]
Merge "protect mIsolatedPackages access"

7 years agoSensorManager: attach background thread to JavaVM
Yifan Hong [Wed, 14 Jun 2017 01:20:09 +0000 (18:20 -0700)]
SensorManager: attach background thread to JavaVM

Test: pass
Bug: 62404135
Change-Id: Ic3c0849cd366f550cbdccbb9bb8d082c5c570c35

7 years agoMerge "Support associating with an already-paired device" into oc-dev am: c041c7a34e...
Eugene Susla [Wed, 14 Jun 2017 00:42:08 +0000 (00:42 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e am: 99f209be12
am: f623be339c

Change-Id: Idc42c2e44c70e06dd56cd8a556ce91fb3cb10cea

7 years agoMerge "Support associating with an already-paired device" into oc-dev am: c041c7a34e...
Eugene Susla [Wed, 14 Jun 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e am: c26f789ae2
am: dfa5272295

Change-Id: Ic68002087eacf339356e13e10698d88e1ff30c40

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 14 Jun 2017 00:29:52 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
Eugene Susla [Wed, 14 Jun 2017 00:29:15 +0000 (00:29 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
am: 99f209be12

Change-Id: Ia2e43979fb0e1687874e63249f829e221a1c47f7

7 years agoMerge "Merge "Add plugin hooks to DozeService" into oc-dr1-dev am: 644f8e8583 am...
Android Build Merger (Role) [Wed, 14 Jun 2017 00:25:28 +0000 (00:25 +0000)]
Merge "Merge "Add plugin hooks to DozeService" into oc-dr1-dev am: 644f8e8583 am: a2521669b3"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 14 Jun 2017 00:24:59 +0000 (00:24 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Add plugin hooks to DozeService" into oc-dr1-dev am: 644f8e8583
Mady Mellor [Wed, 14 Jun 2017 00:24:39 +0000 (00:24 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev am: 644f8e8583
am: a2521669b3

Change-Id: I98935aecbd2158711787bbd7253eaea938c75c71

7 years agoMerge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
Eugene Susla [Wed, 14 Jun 2017 00:24:12 +0000 (00:24 +0000)]
Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e
am: c26f789ae2

Change-Id: Ice5843da51415f87140a6311415a7074b155cdb3

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am...
Christopher Tate [Wed, 14 Jun 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787 am: 4c8dccf728
am: 9d9543de55

Change-Id: I27057df6948c0c0af46afa95e58c15b7014d733c

7 years agoMerge "Support associating with an already-paired device" into oc-dev
Eugene Susla [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e

7 years agoMerge "Merge "Fix #62545908 : 'metered' network jobs run without network" into oc...
Christopher Tate [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787 am: 85c9638438" into oc-dr1-dev-plus-aosp
am: 2a96534f0e

Change-Id: I6905b808c339bef349aedef0acc63c0c2d1aeda4

7 years agoMerge "Support associating with an already-paired device" into oc-dev
Eugene Susla [Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2

7 years agoMerge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am...
Adam Lesinski [Wed, 14 Jun 2017 00:13:13 +0000 (00:13 +0000)]
Merge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am: e9a4951c4d" into oc-dr1-dev-plus-aosp
am: d622e7e538

Change-Id: I1f94c42cacd5cf90eed79be34dd2b3d42548e725

7 years agoApp launch test apk change
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change

Support launching the app using the package name.
Remove the unused variables.

b/33226470

Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit a00259f47dc480f799a812a00f52e3c887aae4b0)

7 years agoMerge "Support associating with an already-paired device" into oc-dev
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev

7 years agoMerge "Add plugin hooks to DozeService" into oc-dr1-dev
Mady Mellor [Tue, 13 Jun 2017 23:59:15 +0000 (23:59 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
am: 644f8e8583

Change-Id: Idfa991157c7885861a2fc51492175ca7e2b3bb08

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am: 26cafd3e42
Adam Lesinski [Tue, 13 Jun 2017 23:52:46 +0000 (23:52 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am: 26cafd3e42
am: 6e54251a84

Change-Id: If2f275ff3f0b8d0114dbd7d4842d64ef8c1700e7

7 years agoMerge "Add plugin hooks to DozeService" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am...
Christopher Tate [Tue, 13 Jun 2017 23:49:55 +0000 (23:49 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787
am: 4c8dccf728

Change-Id: I05d188c5b7ede54792b22d6c1445b32f4a63ed22

7 years agoMerge "Merge "Boost the anim thread priority when doing a bounds animation." into...
Winson Chung [Tue, 13 Jun 2017 23:49:25 +0000 (23:49 +0000)]
Merge "Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am: 167f0001b8 am: 8b5b0c2bfa" into oc-dr1-dev-plus-aosp
am: 2e214c441b

Change-Id: Ia17231c00fd0a78ea473c932765d66d487bb6095

7 years agoMerge "Merge "Fix #62545908 : 'metered' network jobs run without network" into oc...
Android Build Merger (Role) [Tue, 13 Jun 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787 am: 85c9638438" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am...
Christopher Tate [Tue, 13 Jun 2017 23:44:45 +0000 (23:44 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev am: 796b510787
am: 85c9638438

Change-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d

7 years agoMerge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am...
Android Build Merger (Role) [Tue, 13 Jun 2017 23:44:14 +0000 (23:44 +0000)]
Merge "Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e am: e9a4951c4d" into oc-dr1-dev-plus-aosp

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
Adam Lesinski [Tue, 13 Jun 2017 23:43:08 +0000 (23:43 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
am: e9a4951c4d

Change-Id: I8093fff1e13490be07b62537bbfdfd064102bb46

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
Adam Lesinski [Tue, 13 Jun 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev am: 9274d87a0e
am: 26cafd3e42

Change-Id: I59bdeb970bd305f7c01a3f2cf405102ae95756ed

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 23:39:28 +0000 (23:39 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
am: 796b510787

Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b

7 years agoMerge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am: f69a9c...
Brad Ebinger [Tue, 13 Jun 2017 23:37:18 +0000 (23:37 +0000)]
Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am: f69a9c9dc6" into oc-dr1-dev-plus-aosp
am: 3f6af5d5b6

Change-Id: Ic86b7c0fbea0e5de8fbd3c7b8561d54fb2f32940

7 years agoMerge "Boost the anim thread priority when doing a bounds animation." into oc-dev...
Winson Chung [Tue, 13 Jun 2017 23:34:53 +0000 (23:34 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev am: 167f0001b8 am: 3609f00c42
am: fcc2d58b74

Change-Id: I6460764e932157bbfa1346055f889460dc48ce62

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
am: 796b510787

Change-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746

7 years agoMerge "Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: b692f4...
Todd Kennedy [Tue, 13 Jun 2017 23:32:25 +0000 (23:32 +0000)]
Merge "Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: b692f4a095" into oc-dr1-dev-plus-aosp
am: 839fad6e4c

Change-Id: Ib259f55958ca2bc600cd5fc7ab8e95fd020bfd56

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am: 9274d87a0e

Change-Id: I559890874c83627283a891f7eb6c4fd46430f618

7 years agoDisable StatusBar logs
Lucas Dupin [Tue, 13 Jun 2017 23:30:15 +0000 (16:30 -0700)]
Disable StatusBar logs

Reverted DEBUG flag that was accidentally
set to true.

Test: make
Change-Id: Icb37d7831052f4bb1c3a1e2349f5af5270a9e932

7 years agoMerge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev

7 years agoprotect mIsolatedPackages access
Todd Kennedy [Tue, 13 Jun 2017 23:22:33 +0000 (16:22 -0700)]
protect mIsolatedPackages access

Change-Id: I125cd382315f88741c59e3c649830d43d72aa596
Fixes: 38341243
Test: manual

7 years agoMerge "Use UiContext with StrictMode Dialog" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev

7 years agoMerge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: 80b761b6db
Todd Kennedy [Tue, 13 Jun 2017 23:16:55 +0000 (23:16 +0000)]
Merge "Save overlay paths as user state" into oc-dev am: 508a5bade6 am: 80b761b6db
am: 7ad9b0bbd4

Change-Id: Iead9bfc153bfffd43d3d0f3cf68f066cedf4931c