OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: 59dd2ebfc1
Filip Pavlis [Fri, 7 Apr 2017 10:44:51 +0000 (10:44 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: 59dd2ebfc1
am: 3b3bf87165

Change-Id: I314d9bfa7d29eb506fa4bb7faedd7f8d506098b4

7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:38:35 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am: 59dd2ebfc1

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb

7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am...
Jakub Pawlowski [Fri, 7 Apr 2017 07:22:30 +0000 (07:22 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f am: bc095f035d
am: 93cba9eeca

Change-Id: Id711563a93995c1c58bcf299d3cca3c3624557fc

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am...
Jakub Pawlowski [Fri, 7 Apr 2017 07:14:36 +0000 (07:14 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f
am: bc095f035d

Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975
Jakub Pawlowski [Fri, 7 Apr 2017 07:05:32 +0000 (07:05 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975
am: 909f3b108f

Change-Id: Iba1be10854f9f7c8fd1459150dfdc79ac8eac395

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Jakub Pawlowski [Fri, 7 Apr 2017 06:57:30 +0000 (06:57 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Treehugger Robot [Fri, 7 Apr 2017 06:44:48 +0000 (06:44 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"

7 years agoMerge "Do not make strong reference to Resources." into oc-dev am: 327c0b9f88
Bryce Lee [Fri, 7 Apr 2017 06:37:32 +0000 (06:37 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev am: 327c0b9f88
am: c1ed86ab10

Change-Id: Idd0c2d7be02d4de7318e805d639ad0d5cc016e44

7 years agoMerge "Do not make strong reference to Resources." into oc-dev
Bryce Lee [Fri, 7 Apr 2017 06:29:24 +0000 (06:29 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
am: 327c0b9f88

Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a

7 years agoMerge "Do not make strong reference to Resources." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 06:20:56 +0000 (06:20 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
Lorenzo Colitti [Fri, 7 Apr 2017 05:21:23 +0000 (05:21 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
am: fa84050a7e

Change-Id: If1abfc3a7ee596e23257d0259bc5d0243f31e82b

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440
am: d6b2e7ac93

Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd
Lorenzo Colitti [Fri, 7 Apr 2017 05:04:49 +0000 (05:04 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd
am: 09146fc440

Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 05:00:15 +0000 (05:00 +0000)]
Merge "Add NETWORK_STACK permission"
am: b23fabf3fd

Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 04:51:13 +0000 (04:51 +0000)]
Merge "Add NETWORK_STACK permission"

7 years agoDo not make strong reference to Resources.
Bryce Lee [Thu, 6 Apr 2017 17:27:53 +0000 (10:27 -0700)]
Do not make strong reference to Resources.

This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.

Change-Id: I60d767b52de7bbf769f6761f5a3301dd7aff6ddf
Fixes: 36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation

7 years agoMerge "Use Context#startForegroundService in MTP provider"
TreeHugger Robot [Fri, 7 Apr 2017 04:18:20 +0000 (04:18 +0000)]
Merge "Use Context#startForegroundService in MTP provider"

7 years agoMerge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev am: 8ce439a768
Hugo Benichi [Fri, 7 Apr 2017 04:02:17 +0000 (04:02 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev am: 8ce439a768
am: cf247ffa87

Change-Id: Ia71ced7d222cca768c28d3d2fa285abbc0002edc

7 years agoMerge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
Hugo Benichi [Fri, 7 Apr 2017 03:54:47 +0000 (03:54 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
am: 8ce439a768

Change-Id: Ic5984629c83f4af4175a40b6cb70ad5741ca4e25

7 years agoMerge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 03:47:22 +0000 (03:47 +0000)]
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev

7 years agoresolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp
Philip P. Moltmann [Fri, 7 Apr 2017 03:34:44 +0000 (03:34 +0000)]
resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp
am: d45000c1a9

Change-Id: I86966803e94f5e048d48898e7e43d15708c62254

7 years agoresolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp
Philip P. Moltmann [Fri, 7 Apr 2017 03:25:37 +0000 (20:25 -0700)]
resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp

Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5

7 years agoMerge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14...
Hugo Benichi [Fri, 7 Apr 2017 03:21:18 +0000 (03:21 +0000)]
Merge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e am: bdebc29751" into oc-dev-plus-aosp
am: d17977dea3

Change-Id: I0e547294b82eace6555e3fee8709377de9f91a1f

7 years agoMerge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into...
Felipe Leme [Fri, 7 Apr 2017 03:17:24 +0000 (03:17 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev am: 53b6f00dc5
am: 662db89478

Change-Id: Ib43872dd329e0a5fc327aef5e8c9aed38b7e4245

7 years agoMerge "Log excessive remote callbacks" into oc-dev am: 6c171f35be
Amith Yamasani [Fri, 7 Apr 2017 03:14:53 +0000 (03:14 +0000)]
Merge "Log excessive remote callbacks" into oc-dev am: 6c171f35be
am: d0709eca29

Change-Id: I48ed2d683678131482a5837c0771e8c90d8a3f5e

7 years agoMerge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14...
Android Build Merger (Role) [Fri, 7 Apr 2017 03:11:58 +0000 (03:11 +0000)]
Merge "Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e am: bdebc29751" into oc-dev-plus-aosp

7 years agoMerge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am...
Hugo Benichi [Fri, 7 Apr 2017 03:11:09 +0000 (03:11 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14 am: deb64ea13e
am: bdebc29751

Change-Id: I6ce46b76d20d8cad5badb5fd3714c42a70988a06

7 years agoMerge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into...
Felipe Leme [Fri, 7 Apr 2017 03:08:25 +0000 (03:08 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
am: 53b6f00dc5

Change-Id: I553c58613ea0b1ee933a40f5bcbf6c0c49c8b2dd

7 years agoMerge "Log excessive remote callbacks" into oc-dev
Amith Yamasani [Fri, 7 Apr 2017 03:06:50 +0000 (03:06 +0000)]
Merge "Log excessive remote callbacks" into oc-dev
am: 6c171f35be

Change-Id: I9c1703a6c9cff68ee5262c91380c4647a2a79812

7 years agoMerge "Check for a null packageInfo before notifying about app install" into oc-dev...
Calin Juravle [Fri, 7 Apr 2017 03:06:39 +0000 (03:06 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev am: 1fd46de245
am: 63b897585a

Change-Id: I9ebef84e044424da11cecb5acd91e016a3485410

7 years agoMerge "Return inet addr for discoverable printers" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 03:04:12 +0000 (03:04 +0000)]
Merge "Return inet addr for discoverable printers" into oc-dev

7 years agoMerge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14
Hugo Benichi [Fri, 7 Apr 2017 03:03:41 +0000 (03:03 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs" am: d6933a6c14
am: deb64ea13e

Change-Id: I8d9304663e8b5019b65bf048cc7a72e6e9e43043

7 years agoAdd NETWORK_STACK permission
Rebecca Silberstein [Thu, 23 Mar 2017 07:29:28 +0000 (00:29 -0700)]
Add NETWORK_STACK permission

Add a new permission that only allows other system services to call
networking related methods.  This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.

Bug: 36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294

7 years agoMerge "Check for a null packageInfo before notifying about app install" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev
am: 1fd46de245

Change-Id: Ie5591a52e947af61fc04a2b1f64a2fe370f5e657

7 years agoMerge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into...
TreeHugger Robot [Fri, 7 Apr 2017 03:00:01 +0000 (03:00 +0000)]
Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev

7 years agoMerge "Log excessive remote callbacks" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:58:50 +0000 (02:58 +0000)]
Merge "Log excessive remote callbacks" into oc-dev

7 years agoMerge "NetworkMonitor: improve captive portal validation logs"
Hugo Benichi [Fri, 7 Apr 2017 02:56:11 +0000 (02:56 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
am: d6933a6c14

Change-Id: I8f0fd26d6a9f036adc9cc895690aac27d4b8e9cd

7 years agoMerge "Check for a null packageInfo before notifying about app install" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 02:53:19 +0000 (02:53 +0000)]
Merge "Check for a null packageInfo before notifying about app install" into oc-dev

7 years agoMerge "Revise Accessibility button chooser intent/permissions" into oc-dev am: ecb5b5ccc3
Casey Burkhardt [Fri, 7 Apr 2017 02:52:50 +0000 (02:52 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev am: ecb5b5ccc3
am: bc411cd461

Change-Id: I0a085365593d05a77eab013259c2a36ce2c39f1a

7 years agoMerge "NetworkMonitor: improve captive portal validation logs"
Treehugger Robot [Fri, 7 Apr 2017 02:48:55 +0000 (02:48 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"

7 years agoMerge "Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c am...
Hugo Benichi [Fri, 7 Apr 2017 02:46:28 +0000 (02:46 +0000)]
Merge "Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c am: f0928412b0" into oc-dev-plus-aosp
am: 711633b0c6

Change-Id: I109238c489d54b16afe10ca0860301198bfc9114

7 years agoMerge "Revise Accessibility button chooser intent/permissions" into oc-dev
Casey Burkhardt [Fri, 7 Apr 2017 02:45:28 +0000 (02:45 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev
am: ecb5b5ccc3

Change-Id: I7aa9a6760ff74e35875aa24e86f88dc72603075b

7 years agoMerge "Add UPDATE_TZDATA to config updater intents" into oc-dev am: c56d782e13
Chad Brubaker [Fri, 7 Apr 2017 02:45:06 +0000 (02:45 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev am: c56d782e13
am: 49b607a61e

Change-Id: I2b230f16454fd3dca684879c20b839723aac71b0

7 years agoMerge "Revise Accessibility button chooser intent/permissions" into oc-dev
Casey Burkhardt [Fri, 7 Apr 2017 02:40:11 +0000 (02:40 +0000)]
Merge "Revise Accessibility button chooser intent/permissions" into oc-dev

7 years agoMerge "Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c am...
Android Build Merger (Role) [Fri, 7 Apr 2017 02:38:23 +0000 (02:38 +0000)]
Merge "Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c am: f0928412b0" into oc-dev-plus-aosp

7 years agoMerge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c
Hugo Benichi [Fri, 7 Apr 2017 02:37:44 +0000 (02:37 +0000)]
Merge "ConnectivityService: safer locking" am: b8dc7fbc6d am: b960ee662c
am: f0928412b0

Change-Id: If83fae5f70cb2e253a4107591f43d9ce2d648006

7 years agoMerge "Add UPDATE_TZDATA to config updater intents" into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 02:37:36 +0000 (02:37 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev
am: c56d782e13

Change-Id: I14d241e63ead50651ca21aa1d28bce3ba019b5fc

7 years agoMerge "Fix broken CTS tests."
TreeHugger Robot [Fri, 7 Apr 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Fix broken CTS tests."

7 years agoMerge "ConnectivityService: safer locking" am: b8dc7fbc6d
Hugo Benichi [Fri, 7 Apr 2017 02:29:44 +0000 (02:29 +0000)]
Merge "ConnectivityService: safer locking" am: b8dc7fbc6d
am: b960ee662c

Change-Id: If4985a8d51c03ea6cc3be121962bbf27f980fdc7

7 years agoMerge "Add UPDATE_TZDATA to config updater intents" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:28:19 +0000 (02:28 +0000)]
Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev

7 years agoMerge "ConnectivityService: safer locking"
Hugo Benichi [Fri, 7 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "ConnectivityService: safer locking"
am: b8dc7fbc6d

Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c

7 years agoUse Context#startForegroundService in MTP provider
Daichi Hirono [Mon, 3 Apr 2017 03:20:42 +0000 (12:20 +0900)]
Use Context#startForegroundService in MTP provider

NotificationManager.startServiceInForeground() was moved to
Context#startForegroundService. MtpDocumentsProvider should use new one.

Bug: 36794559
Test: MtpDocumentsProviderTests
Change-Id: I84723ee8c3f0f8bfe4d5ea8ad035c01c42ce8bab

7 years agoMerge "ConnectivityService: safer locking"
Hugo Benichi [Fri, 7 Apr 2017 02:10:45 +0000 (02:10 +0000)]
Merge "ConnectivityService: safer locking"

7 years agoMerge "Tuner plugin settings updates" into oc-dev am: eaf6b3b193
Jason Monk [Fri, 7 Apr 2017 01:54:38 +0000 (01:54 +0000)]
Merge "Tuner plugin settings updates" into oc-dev am: eaf6b3b193
am: 574642fef7

Change-Id: I628944551c44c4b54edd04aa963d5f399160dd13

7 years agoMerge "Tuner plugin settings updates" into oc-dev
Jason Monk [Fri, 7 Apr 2017 01:49:16 +0000 (01:49 +0000)]
Merge "Tuner plugin settings updates" into oc-dev
am: eaf6b3b193

Change-Id: If20613b2a78c70b073b00dfc33bd832e3c4b5dc9

7 years agoMerge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6 am: ea377a96...
Steven Moreland [Fri, 7 Apr 2017 01:40:13 +0000 (01:40 +0000)]
Merge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6 am: ea377a967f  -s ours
am: 2ab4458405  -s ours

Change-Id: I6c68898c1b6ca118b8240b22032e46f761541a45

7 years agoMerge "Tuner plugin settings updates" into oc-dev
Jason Monk [Fri, 7 Apr 2017 01:39:25 +0000 (01:39 +0000)]
Merge "Tuner plugin settings updates" into oc-dev

7 years agoMerge "Added onMovedToDisplay method to WebView" into oc-dev am: be41b61216
Tima Vaisburd [Fri, 7 Apr 2017 01:32:30 +0000 (01:32 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev am: be41b61216
am: 0b1023a263

Change-Id: Idbe3e7953de5df25a7c416f7b0678acb2f87de38

7 years agoMerge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6
Steven Moreland [Fri, 7 Apr 2017 01:29:42 +0000 (01:29 +0000)]
Merge "Use hwservicemanager getTransport." am: 562ed84ff4 am: 9912ec4ca6
am: ea377a967f  -s ours

Change-Id: Idb0e7c9d95ade65922241316fe1c75b5cee56d98

7 years agoMerge "Use hwservicemanager getTransport." am: 562ed84ff4
Steven Moreland [Fri, 7 Apr 2017 01:24:38 +0000 (01:24 +0000)]
Merge "Use hwservicemanager getTransport." am: 562ed84ff4
am: 9912ec4ca6

Change-Id: I08c33de1eb82b6717b4a9d4d76211dd0fa638d52

7 years agoMerge "Added onMovedToDisplay method to WebView" into oc-dev
Tima Vaisburd [Fri, 7 Apr 2017 01:24:36 +0000 (01:24 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev
am: be41b61216

Change-Id: Ib119a90509998347b6ad26862ddfdb2d5299fb42

7 years agoMerge "Added onMovedToDisplay method to WebView" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 01:18:55 +0000 (01:18 +0000)]
Merge "Added onMovedToDisplay method to WebView" into oc-dev

7 years agoMerge "Use hwservicemanager getTransport."
Steven Moreland [Fri, 7 Apr 2017 01:18:36 +0000 (01:18 +0000)]
Merge "Use hwservicemanager getTransport."
am: 562ed84ff4

Change-Id: I39ee473166dce391f3cad4acf62821a4dfb9f444

7 years agoMerge "Use hwservicemanager getTransport."
Steven Moreland [Fri, 7 Apr 2017 01:10:56 +0000 (01:10 +0000)]
Merge "Use hwservicemanager getTransport."

7 years agoWho wants...to live...forever? The "Save for Autofill?" dialog does!
Felipe Leme [Fri, 7 Apr 2017 01:03:39 +0000 (18:03 -0700)]
Who wants...to live...forever? The "Save for Autofill?" dialog does!

Fixes: 37083017
Test: manual verification
Test: CtsAutoFillServiceTestCases pass

Change-Id: Id177fb59810956e4b43c1d357de415d64ab9d89a

7 years agoMerge "Add metrics for nav buttons through KeyButtonView" into oc-dev am: 809b79da2f
Jason Monk [Fri, 7 Apr 2017 00:52:44 +0000 (00:52 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev am: 809b79da2f
am: e2aec43121  -s ours

Change-Id: I00137cc7fc677e180aad606862d5b13b5f420c60

7 years agoNetworkMonitor: improve captive portal validation logs
Hugo Benichi [Thu, 6 Apr 2017 05:36:39 +0000 (14:36 +0900)]
NetworkMonitor: improve captive portal validation logs

This patch adds probe type and url to all validation logs about web
probes sent for captive portal detection.

Test: built, flashed, looked at $ adb shell dumpsys connectivity
Bug: 3683020636532213
Change-Id: Iee2caaf6664f3d097f9d1888ccc5fece0a95994c

7 years agoMerge "NotiViewWrapper: Fix test that breaks on master" into oc-dev am: ad27aa11b1
Adrian Roos [Fri, 7 Apr 2017 00:46:37 +0000 (00:46 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev am: ad27aa11b1
am: 29a518f2b0  -s ours

Change-Id: I3c0d087a5ec909f1998260a0d0ffe885c98d5b6d

7 years agoMerge "Add metrics for nav buttons through KeyButtonView" into oc-dev
Jason Monk [Fri, 7 Apr 2017 00:45:35 +0000 (00:45 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
am: 809b79da2f

Change-Id: I1e66207bb9c5fc882f3a8b41e44a6f85d894401b

7 years agoMerge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc...
Calin Juravle [Fri, 7 Apr 2017 00:45:30 +0000 (00:45 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev am: d34076385d
am: e5fffd4b83

Change-Id: I24607ab97be3acbb06cac8f2c78416ae092865eb

7 years agoMerge "Pass SElinux info to installd dexopt" into oc-dev am: 31762dd9a0
Calin Juravle [Fri, 7 Apr 2017 00:43:38 +0000 (00:43 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev am: 31762dd9a0
am: e5b210fc55

Change-Id: I7e9ff742f23b5b22fcc70f6e06209c05ad2fcfed

7 years agoMerge "Add system config to specify Multi-Display support" into oc-dev am: ff15be677b
Andrii Kulian [Fri, 7 Apr 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev am: ff15be677b
am: 53fac181fa

Change-Id: I90539760c066cae07fc892da745ec05d08be3935

7 years agoMerge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 00:39:42 +0000 (00:39 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
am: ad27aa11b1

Change-Id: I4a74e401b9c4cdaeb0b27919b03e24b88855edb8

7 years agoMerge "Add metrics for nav buttons through KeyButtonView" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 00:39:27 +0000 (00:39 +0000)]
Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev

7 years agoMerge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:38:23 +0000 (00:38 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
am: d34076385d

Change-Id: I498941457eba58e39d1a57238ed3c7e66cb278e3

7 years agoMerge "Pass SElinux info to installd dexopt" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:36:20 +0000 (00:36 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev
am: 31762dd9a0

Change-Id: Ifd344ec8396ebbd62940522e259ddc72b6e4f1c0

7 years agoMerge "Add system config to specify Multi-Display support" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 00:32:24 +0000 (00:32 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev
am: ff15be677b

Change-Id: Ib6e89adaaf759545efb050a599519eb3105754f1

7 years agoMerge "Fix crash when using list of enabled a11y services" into oc-dev am: 3879a39ee6
Phil Weaver [Fri, 7 Apr 2017 00:30:59 +0000 (00:30 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev am: 3879a39ee6
am: dbb297e715

Change-Id: I585410a381836770d4b98359f8ae9ff3723b6c10

7 years agoMerge "NotiViewWrapper: Fix test that breaks on master" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 00:26:30 +0000 (00:26 +0000)]
Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev

7 years agoMerge "Fix crash when using list of enabled a11y services" into oc-dev
Phil Weaver [Fri, 7 Apr 2017 00:25:38 +0000 (00:25 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev
am: 3879a39ee6

Change-Id: Ifa3acdc07c4b9420fbb421587432b0c0aae203a2

7 years agoMerge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:24:21 +0000 (00:24 +0000)]
Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev

7 years agoMerge "Pass SElinux info to installd dexopt" into oc-dev
Calin Juravle [Fri, 7 Apr 2017 00:23:43 +0000 (00:23 +0000)]
Merge "Pass SElinux info to installd dexopt" into oc-dev

7 years agoMerge "Add system config to specify Multi-Display support" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 00:22:37 +0000 (00:22 +0000)]
Merge "Add system config to specify Multi-Display support" into oc-dev

7 years agoMerge "Fix injected settings titles not matching a locale change." into oc-dev am...
William Luh [Fri, 7 Apr 2017 00:16:36 +0000 (00:16 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev am: 1b54760eee
am: 5669141382

Change-Id: Ic628750c2332cfdf734bf7798e378ddf93a0cdbd

7 years agoMerge "Fix injected settings titles not matching a locale change." into oc-dev
William Luh [Fri, 7 Apr 2017 00:09:34 +0000 (00:09 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev
am: 1b54760eee

Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2

7 years agoMerge "Fix crash when using list of enabled a11y services" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 00:08:20 +0000 (00:08 +0000)]
Merge "Fix crash when using list of enabled a11y services" into oc-dev

7 years agoMerge "Fix injected settings titles not matching a locale change." into oc-dev
William Luh [Fri, 7 Apr 2017 00:00:40 +0000 (00:00 +0000)]
Merge "Fix injected settings titles not matching a locale change." into oc-dev

7 years agoNetworkPolicyManagerService: turn off rule debugging
Hugo Benichi [Thu, 6 Apr 2017 23:53:25 +0000 (08:53 +0900)]
NetworkPolicyManagerService: turn off rule debugging

Left over from Change-Id Ic75d4f7a8853e6be20e51262c4b59805ec35093a.

Test: no functional changes
Bug: 37084734
Change-Id: Ifb10b4fe146bb6bea6260d8cd723a8e7f5b853a9

7 years agoMerge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev am: 34cb00ac83
Patrik Torstensson [Thu, 6 Apr 2017 23:44:18 +0000 (23:44 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev am: 34cb00ac83
am: 890715d071

Change-Id: I0e4fdaea8131a0dd6e8873d3f9152a5b2e59ba37

7 years agoMerge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
Patrik Torstensson [Thu, 6 Apr 2017 23:41:03 +0000 (23:41 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
am: 34cb00ac83

Change-Id: I2871b1f3edbf24c3a5b1ef49d432f5394198e6d7

7 years agoMerge "Set android.display thread to top-app cpusets and schedtune group" into oc...
Joel Fernandes [Thu, 6 Apr 2017 23:40:46 +0000 (23:40 +0000)]
Merge "Set android.display thread to top-app cpusets and schedtune group" into oc-dev am: 5362f10dad
am: 86c305163d

Change-Id: I398f2c4316b0109d7c8f993a6474fff4f6276b2c

7 years agoMerge "Add intent to intialize programs on APP installed" into oc-dev am: 9c1e85384e
Dongwon Kang [Thu, 6 Apr 2017 23:39:43 +0000 (23:39 +0000)]
Merge "Add intent to intialize programs on APP installed" into oc-dev am: 9c1e85384e
am: 2b45152532

Change-Id: Idfafd349f7c03c183cf8bc7b49097ec735d36225

7 years agoMerge "Don't start a partition when session is pending FillResponse authentication...
Felipe Leme [Thu, 6 Apr 2017 23:38:38 +0000 (23:38 +0000)]
Merge "Don't start a partition when session is pending FillResponse authentication." into oc-dev am: 6f5db9a2a8
am: 2528acedb8

Change-Id: I49f296469dc79b231573a4bcec29ee23fbb63c82

7 years agoLog excessive remote callbacks
Amith Yamasani [Thu, 6 Apr 2017 17:29:33 +0000 (10:29 -0700)]
Log excessive remote callbacks

Bug: 36778087
Test: N/A
Change-Id: Ifb02fe09e3c0869f7f6c741f886421064e5c1b8a

7 years agoMerge "Preserve app window when it requests a relaunch" into oc-dev am: 9e96ecfe9c
Wale Ogunwale [Thu, 6 Apr 2017 23:37:30 +0000 (23:37 +0000)]
Merge "Preserve app window when it requests a relaunch" into oc-dev am: 9e96ecfe9c
am: 39ffe49a37

Change-Id: I1b6e9cc8fd016c7c789cd4daf7787b1a048b992b

7 years agoMerge "Add lower case charging string." into oc-dev am: e263940142
jackqdyulei [Thu, 6 Apr 2017 23:36:26 +0000 (23:36 +0000)]
Merge "Add lower case charging string." into oc-dev am: e263940142
am: cd98c5dd0f

Change-Id: Idbc16c204298ed566d4e9fa3039f1ae072e96b68

7 years agoMerge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 23:35:31 +0000 (23:35 +0000)]
Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev

7 years agoMerge "Removed deprecated onFillRequest() method" into oc-dev am: 7a7c0ace82
Felipe Leme [Thu, 6 Apr 2017 23:32:11 +0000 (23:32 +0000)]
Merge "Removed deprecated onFillRequest() method" into oc-dev am: 7a7c0ace82
am: 3e91021212

Change-Id: Ia3613f20ada223fedbd6562f189b5992e36d3c33

7 years agoMerge "Use hwservicemanager getTransport." into oc-dev am: 610b55e8bc
Steven Moreland [Thu, 6 Apr 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Use hwservicemanager getTransport." into oc-dev am: 610b55e8bc
am: 2df14a6aa1

Change-Id: I604bec017b538ef6f9ef1014dd3542512537fdc3