OSDN Git Service

android-x86/frameworks-base.git
6 years agoAllow managed services on watches
Julia Reynolds [Tue, 24 Oct 2017 14:39:11 +0000 (10:39 -0400)]
Allow managed services on watches

Test: runtest systemui-notification
Change-Id: I5b2f7ae62f118c641f2d06ef8a70222a4a1ca37e
Fixes: 66954790

6 years agoMerge "Metrics wifi.proto for connected wifi score"
Michael Plass [Tue, 31 Oct 2017 18:33:05 +0000 (18:33 +0000)]
Merge "Metrics wifi.proto for connected wifi score"

6 years agoMerge "Parse BCP 47 locale names with Unicode extensions"
Roozbeh Pournader [Tue, 31 Oct 2017 18:28:32 +0000 (18:28 +0000)]
Merge "Parse BCP 47 locale names with Unicode extensions"

6 years agoMerge "Display network name in status bar"
TreeHugger Robot [Tue, 31 Oct 2017 17:52:52 +0000 (17:52 +0000)]
Merge "Display network name in status bar"

6 years agoMerge "Create a new API allowing callers to concat a serialized message field."
Yi Jin [Tue, 31 Oct 2017 17:33:13 +0000 (17:33 +0000)]
Merge "Create a new API allowing callers to concat a serialized message field."

6 years agoMerge "Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb2...
Android Build Merger (Role) [Tue, 31 Oct 2017 17:14:37 +0000 (17:14 +0000)]
Merge "Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d am: 5878e9c46b am: 1e52719791"

6 years agoMerge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572...
Siyamed Sinir [Tue, 31 Oct 2017 17:13:06 +0000 (17:13 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d am: 5878e9c46b
am: 1e52719791

Change-Id: I946cb4da20d299c529a90ee7557e7d128e2e9504

6 years agoMerge "Add metric constant for oem lock dialog"
TreeHugger Robot [Tue, 31 Oct 2017 17:11:37 +0000 (17:11 +0000)]
Merge "Add metric constant for oem lock dialog"

6 years agoMerge "Fix failing/flaky TextViewActivityTests"
TreeHugger Robot [Tue, 31 Oct 2017 17:02:59 +0000 (17:02 +0000)]
Merge "Fix failing/flaky TextViewActivityTests"

6 years agoMerge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572...
Siyamed Sinir [Tue, 31 Oct 2017 16:55:04 +0000 (16:55 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d
am: 5878e9c46b

Change-Id: Id2e10f670cf6687fe62dbe67bb7615b9121743f4

6 years agoMerge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572
Siyamed Sinir [Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572
am: 88f92e101d

Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815

6 years agoMerge "docs: Fix documentation typo" into oc-mr1-dev am: f8fb25ca04
Andrew Solovay [Tue, 31 Oct 2017 16:41:00 +0000 (16:41 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev am: f8fb25ca04
am: 4450e53ee0

Change-Id: I90bd3cca6876e22d7bf4097040bdd5d21a8f68ef

6 years agoMerge "docs: Fix documentation typo" into oc-mr1-dev
Andrew Solovay [Tue, 31 Oct 2017 16:31:12 +0000 (16:31 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
am: f8fb25ca04

Change-Id: I450ba09a2f6efb155601cd08fe9e1d0c35e9fec5

6 years agoMerge "Use calling user ID when calling isDeviceLocked" into oc-dev
Siyamed Sinir [Tue, 31 Oct 2017 16:31:04 +0000 (16:31 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
am: 31bcb22572

Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005

6 years agoMerge "Use calling user ID when calling isDeviceLocked" into oc-dev
Siyamed Sinir [Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev

6 years agoMerge "docs: Fix documentation typo" into oc-mr1-dev
Andrew Solovay [Tue, 31 Oct 2017 16:15:57 +0000 (16:15 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev

6 years agoDisplay network name in status bar
Kensuke Matsui [Tue, 14 Mar 2017 04:27:20 +0000 (13:27 +0900)]
Display network name in status bar

When config_showOperatorNameInStatusBar is true, the network name is
displayed in the status bar.
The user can turn on/off the feature from Settings app (Settings >
Display > Network name).

Fixes: 67620513
Test: manual - insert a valid SIM and go to the Home screen.

Change-Id: I6d03ec00a19e2f5e4c2d2918f1a7c33fdee00dd2

6 years agoMerge "Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES...
Android Build Merger (Role) [Tue, 31 Oct 2017 15:55:26 +0000 (15:55 +0000)]
Merge "Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be81189 am: 8476a2c75d am: c77b846688"

6 years agoMerge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be...
Colin Cross [Tue, 31 Oct 2017 15:53:21 +0000 (15:53 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be81189 am: 8476a2c75d
am: c77b846688

Change-Id: Id27ebbdae64400b3e55915dda1cd9186ddd8f1f6

6 years agoMerge "Cleaning up InputConsumers"
Winson Chung [Tue, 31 Oct 2017 15:50:29 +0000 (15:50 +0000)]
Merge "Cleaning up InputConsumers"

6 years agoMerge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be...
Colin Cross [Tue, 31 Oct 2017 15:42:52 +0000 (15:42 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be81189
am: 8476a2c75d

Change-Id: I005a2a4b02c2c0665e2f3aa84d59c5202a8991cb

6 years agoMerge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Colin Cross [Tue, 31 Oct 2017 15:33:53 +0000 (15:33 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
am: 834be81189

Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7

6 years agoMerge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"

6 years agoFix failing/flaky TextViewActivityTests
Abodunrinwa Toki [Tue, 31 Oct 2017 03:46:46 +0000 (03:46 +0000)]
Fix failing/flaky TextViewActivityTests

These tests are flaky because each negative assertion in Espresso
is taking about a minute or two to run. Espresso is waiting that long.

This cl solves the issue by:
1. Deprecating and excluding the negative assertions where they are
   not required for the test to still be meaningful.
2. Re-written to no use negative assertions where possible.
3. Suppress a failing test. We're not getting much value from this
   anyway.
TODO (in incoming cl):  Alternative action mode assertions.

Change-Id: Ic808f687151d225689d839b4caf4ef0b8d70cff0
Bug: 67023680
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest

6 years agoMerge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b5195...
Tobias Thierer [Tue, 31 Oct 2017 14:01:37 +0000 (14:01 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b519569eb3 am: 4f59edb63f
am: 60923f7860

Change-Id: I52d63eac03e32f6d020809cae2cecb7cad0154c0

6 years agoMerge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b5195...
Tobias Thierer [Tue, 31 Oct 2017 13:51:26 +0000 (13:51 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b519569eb3
am: 4f59edb63f

Change-Id: If74e0f6783bb38c707a3575821255e8f1ec4d78f

6 years agoMerge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
Tobias Thierer [Tue, 31 Oct 2017 13:41:34 +0000 (13:41 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
am: b519569eb3

Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb

6 years agoMerge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
Treehugger Robot [Tue, 31 Oct 2017 13:26:23 +0000 (13:26 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"

6 years agoMerge "Fix PixelCopy readback"
TreeHugger Robot [Tue, 31 Oct 2017 13:24:59 +0000 (13:24 +0000)]
Merge "Fix PixelCopy readback"

6 years agoMerge "Add App Op for changing WiFi State."
TreeHugger Robot [Tue, 31 Oct 2017 12:47:35 +0000 (12:47 +0000)]
Merge "Add App Op for changing WiFi State."

6 years agoMerge "Sync gauge metric proto to AOSP."
TreeHugger Robot [Tue, 31 Oct 2017 08:58:16 +0000 (08:58 +0000)]
Merge "Sync gauge metric proto to AOSP."

6 years agoMerge "Implement a logic to rate limitted flush statsd with by checking the size...
TreeHugger Robot [Tue, 31 Oct 2017 07:41:24 +0000 (07:41 +0000)]
Merge "Implement a logic to rate limitted flush statsd with by checking the size of each MetricsProducer's. The implementation of byteSize() method is still TBD as it depends on migration to ProtoOutputStream."

6 years agoSync gauge metric proto to AOSP.
Yangster [Mon, 30 Oct 2017 17:29:52 +0000 (10:29 -0700)]
Sync gauge metric proto to AOSP.

Test: manually run all the tests.

Change-Id: I81a282c6253d4b4577d8aea31490bb011988435c

6 years agoImplement a logic to rate limitted flush statsd with by checking the
yro [Fri, 27 Oct 2017 03:42:57 +0000 (20:42 -0700)]
Implement a logic to rate limitted flush statsd with by checking the
size of each MetricsProducer's. The implementation of byteSize() method
is still TBD as it depends on migration to ProtoOutputStream.

Test: statsd, statsd_test
Change-Id: I966606044d7cb814dabe94192bacecad91f28177

6 years agoMerge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca4...
Abodunrinwa Toki [Tue, 31 Oct 2017 03:45:59 +0000 (03:45 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca42d5ac am: f247977cbe  -s ours am: 91fc6d303e  -s ours
am: 594173a8bb  -s ours

Change-Id: I84504b330cb7ce2ca9250b0a9a6134abf6817439

6 years agoMerge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca4...
Abodunrinwa Toki [Tue, 31 Oct 2017 03:36:50 +0000 (03:36 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca42d5ac am: f247977cbe  -s ours
am: 91fc6d303e  -s ours

Change-Id: I390fbea45448e5910648b8e804ce54d77b8b8d01

6 years agoMerge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca4...
Abodunrinwa Toki [Tue, 31 Oct 2017 03:23:35 +0000 (03:23 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev am: 66ca42d5ac
am: f247977cbe  -s ours

Change-Id: I124dc4a15563effa89049e87efe2304867d05961

6 years agoMerge "Respect legacy color mode settings"
Christine Franks [Tue, 31 Oct 2017 03:16:05 +0000 (03:16 +0000)]
Merge "Respect legacy color mode settings"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Oct 2017 03:12:17 +0000 (03:12 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
Abodunrinwa Toki [Tue, 31 Oct 2017 03:10:06 +0000 (03:10 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
am: 66ca42d5ac

Change-Id: I0e57e666f790c94ddf04d304a633c835a99d3d69

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Oct 2017 03:06:49 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Oct 2017 03:04:50 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Fix Robolectric Bluetooth tests" am: 01c9c0e4ba am: 2f1cb548ba
Hansong Zhang [Tue, 31 Oct 2017 03:01:25 +0000 (03:01 +0000)]
Merge "Fix Robolectric Bluetooth tests" am: 01c9c0e4ba am: 2f1cb548ba
am: d327f7a576

Change-Id: I13676ddd4498df457ad11918ad73bfcdcf3297a1

6 years agoMerge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
TreeHugger Robot [Tue, 31 Oct 2017 03:01:08 +0000 (03:01 +0000)]
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev

6 years agoMerge "Fix Robolectric Bluetooth tests" am: 01c9c0e4ba
Hansong Zhang [Tue, 31 Oct 2017 02:50:44 +0000 (02:50 +0000)]
Merge "Fix Robolectric Bluetooth tests" am: 01c9c0e4ba
am: 2f1cb548ba

Change-Id: Ifded4e54edd53242a40d3f8e123f614cd6e44d84

6 years agoMerge "Fix Robolectric Bluetooth tests"
Hansong Zhang [Tue, 31 Oct 2017 02:40:45 +0000 (02:40 +0000)]
Merge "Fix Robolectric Bluetooth tests"
am: 01c9c0e4ba

Change-Id: I7987ddaa520c202a15af03bf0791c39a1720d3b3

6 years agoMerge "Fix Robolectric Bluetooth tests"
Treehugger Robot [Tue, 31 Oct 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Fix Robolectric Bluetooth tests"

6 years agoMerge "Move the bluetooth icon logic to settingslib"
TreeHugger Robot [Tue, 31 Oct 2017 01:59:41 +0000 (01:59 +0000)]
Merge "Move the bluetooth icon logic to settingslib"

6 years agoMerge "incidentd: Preparing ActivityManagerService to dump meminfo."
TreeHugger Robot [Tue, 31 Oct 2017 01:54:48 +0000 (01:54 +0000)]
Merge "incidentd: Preparing ActivityManagerService to dump meminfo."

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Tue, 31 Oct 2017 01:09:46 +0000 (01:09 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c am: bd7101937a am: b48acd86c0
am: c4ac607916

Change-Id: I23eeff8ab3dfd281585ef4650a6f036b6c80f4f9

6 years agoAdd metric constant for oem lock dialog
Fan Zhang [Tue, 31 Oct 2017 00:54:24 +0000 (17:54 -0700)]
Add metric constant for oem lock dialog

Change-Id: I2db51e3a1d8246f75ecccae02d22a63adf196380
Fixes: 28199132
Test: rebuild

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Tue, 31 Oct 2017 00:55:23 +0000 (00:55 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c am: bd7101937a
am: b48acd86c0

Change-Id: I5aba8558427da76da5bbe331c207f04415990ac1

6 years agoCreate a new API allowing callers to concat a serialized message field.
Yi Jin [Mon, 30 Oct 2017 23:07:20 +0000 (16:07 -0700)]
Create a new API allowing callers to concat a serialized message field.

Test: N/A
Change-Id: I90570ea62e6c406d40c399cee6cbb8dcb5172e21

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Tue, 31 Oct 2017 00:41:00 +0000 (00:41 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8 am: e3ac25eb0c
am: bd7101937a

Change-Id: I78a26c3abfb72e9b873b719506f869df0aa87da1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 31 Oct 2017 00:35:13 +0000 (17:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I72b8ae492bc2ef5ceacb7f595a0b8a7880c3d2ac
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agodocs: Fix documentation typo
Romain Guy [Thu, 31 Aug 2017 23:08:42 +0000 (16:08 -0700)]
docs: Fix documentation typo

CPd from master so we can update the website.

Test: make ds-docs
Bug: 65213121
Change-Id: I5bfc7074a42ec0ef5cd624b0bb72234e072684d3
(cherry picked from commit d4012d6505c8b5368ee4607d54fb98d0a96ec136)

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Tue, 31 Oct 2017 00:26:33 +0000 (00:26 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8
am: e3ac25eb0c

Change-Id: Iba4bcd510ea20aa6fe928074912a864fe325680a

6 years agoRespect legacy color mode settings
Christine Franks [Mon, 30 Oct 2017 23:22:37 +0000 (16:22 -0700)]
Respect legacy color mode settings

Bug: 68411440
Test: make -j100, verified starting with each of the three options.
Change-Id: I73e701a86733e0f8a5d017949052b16cdf58f398

6 years agoMerge changes I56d15881,Ifd031285
TreeHugger Robot [Tue, 31 Oct 2017 00:11:46 +0000 (00:11 +0000)]
Merge changes I56d15881,Ifd031285

* changes:
  Move out DragInputEventReceiver from WindowManagerService
  Move drag related handler code to DragHandler

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Tue, 31 Oct 2017 00:11:32 +0000 (00:11 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288
am: db258ebba8

Change-Id: Ic9821f05d30a57fad1567e834804cec6ff5dca97

6 years agoMerge "Add more gradient info in VectorDrawable's javadoc"
TreeHugger Robot [Mon, 30 Oct 2017 23:58:47 +0000 (23:58 +0000)]
Merge "Add more gradient info in VectorDrawable's javadoc"

6 years agoFix Robolectric Bluetooth tests
Hansong Zhang [Mon, 30 Oct 2017 23:38:16 +0000 (16:38 -0700)]
Fix Robolectric Bluetooth tests

The Bluetooth HID profile name BluetoothInputDevice is recently changed
to BluetoothHidHost, but it is not updated in the SDK for Robolectric
tests, and it causes problems with SettingsLib tests. Thus, we need to
replace the HID profile use case with PAN. This change will not
influence the test coverage.

Test: make RunSettingsLibRoboTests
Bug: 68213274
Change-Id: If30ef0e82252d8f7229815b80e403ae63ab10643

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 30 Oct 2017 23:53:02 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2764fc021b2b98baf5a22fc6cc62cd169ea524c7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c...
Chong Zhang [Mon, 30 Oct 2017 23:48:44 +0000 (23:48 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa
am: 5330335288

Change-Id: Ic7b7f250073c4c89ac853036516bcade6b875092

6 years agoMerge "Renamed moveTaskToDockedStack to setTaskWindowingModeSplitScreenPrimary"
TreeHugger Robot [Mon, 30 Oct 2017 23:45:31 +0000 (23:45 +0000)]
Merge "Renamed moveTaskToDockedStack to setTaskWindowingModeSplitScreenPrimary"

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899
Chong Zhang [Mon, 30 Oct 2017 23:33:04 +0000 (23:33 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899
am: 396487f5aa

Change-Id: Idf1ec8982316d3cef253609c702435a21d8f2eed

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82
Chong Zhang [Mon, 30 Oct 2017 23:16:40 +0000 (23:16 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82
am: f9e16c9899

Change-Id: Id780ff2bfb2f3881cbf33032971ed3b397a2fcde

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 30 Oct 2017 23:11:23 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2fbcc678b4ac65a70f023a9740ff41c5583757b9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev
Chong Zhang [Mon, 30 Oct 2017 23:00:59 +0000 (23:00 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
am: 914bc14e82

Change-Id: I9f8e2264e93590de4179ee5c6ab30c7509e775f5

6 years agoMerge "Fix StateMachine init/quit race."
TreeHugger Robot [Mon, 30 Oct 2017 22:57:47 +0000 (22:57 +0000)]
Merge "Fix StateMachine init/quit race."

6 years agoMerge "mtp: fix double free of thumbnail data" into nyc-dev
Chong Zhang [Mon, 30 Oct 2017 22:46:40 +0000 (22:46 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev

6 years agoMerge "Parcel nested stack trace elements"
TreeHugger Robot [Mon, 30 Oct 2017 22:38:25 +0000 (22:38 +0000)]
Merge "Parcel nested stack trace elements"

6 years agoMerge "BatteryService: restrict service notification logic"
TreeHugger Robot [Mon, 30 Oct 2017 21:47:35 +0000 (21:47 +0000)]
Merge "BatteryService: restrict service notification logic"

6 years agoMerge "Add metric for anomaly detection"
TreeHugger Robot [Mon, 30 Oct 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Add metric for anomaly detection"

6 years agoCleaning up InputConsumers
Winson Chung [Mon, 25 Sep 2017 23:23:26 +0000 (16:23 -0700)]
Cleaning up InputConsumers

- Log the pid and user handle for the client input consumer
- Pass token to WMS to ensure that it is notified when the client input
  consumer process is killed

Bug: 37309537
Test: android.server.am.ActivityManagerPinnedStackTests
Change-Id: I432d96b1f524ab34dbbad3eeb67d996abdd5f4ca
Signed-off-by: Winson Chung <winsonc@google.com>
6 years agoMerge "2/ Add API to start overview activity with assist callbacks"
Winson Chung [Mon, 30 Oct 2017 20:51:06 +0000 (20:51 +0000)]
Merge "2/ Add API to start overview activity with assist callbacks"

6 years agoMerge "[RTT2] Add RTT availability API"
Etan Cohen [Mon, 30 Oct 2017 19:43:06 +0000 (19:43 +0000)]
Merge "[RTT2] Add RTT availability API"

6 years agoAdd metric for anomaly detection
jackqdyulei [Tue, 24 Oct 2017 23:32:58 +0000 (16:32 -0700)]
Add metric for anomaly detection

ACTION_APP_STOP_AND_BACKGROUND_CHECK
FIELD_ANOMALY_ACTION_TYPE
ANOMALY_TYPE_WAKELOCK
ANOMALY_TYPE_WAKEUP_ALARM
ANOMALY_TYPE_UNOPTIMIZED_BT

Bug: 68215016
Test: Build
Change-Id: I66f0465a3b89713060948af31c370e9ac894e0ff

6 years agoMerge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev am: b1748f87b1
Andrew Solovay [Mon, 30 Oct 2017 18:41:58 +0000 (18:41 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev am: b1748f87b1
am: 152be97c2e

Change-Id: I1bde702c235218e35e0592aedb7491f1a2ff2582

6 years agoMerge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am...
Tobias Thierer [Mon, 30 Oct 2017 18:32:55 +0000 (18:32 +0000)]
Merge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am: 1f7fcb7970" into oc-mr1-dev-plus-aosp
am: f63d128dd9

Change-Id: Ibb562280213bdaa499787c0e6cfd371c553d4f1c

6 years agoMerge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
Andrew Solovay [Mon, 30 Oct 2017 18:15:21 +0000 (18:15 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
am: b1748f87b1

Change-Id: I2336a38fb00f2c53406718e4e3a47f989ed1c094

6 years agoMerge "docs: Clarified description of height and width attrs" into oc-mr1-dev am...
Andrew Solovay [Mon, 30 Oct 2017 18:14:41 +0000 (18:14 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev am: ddad5593c2
am: d18e375ece

Change-Id: I107764c21e666f541920f068ebf78ee88269954a

6 years agoMerge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am...
Android Build Merger (Role) [Mon, 30 Oct 2017 18:08:55 +0000 (18:08 +0000)]
Merge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am: 1f7fcb7970" into oc-mr1-dev-plus-aosp

6 years agoMerge "Track moving of OkHttp facade API to new package." am: 45183fc5a7
Tobias Thierer [Mon, 30 Oct 2017 18:05:53 +0000 (18:05 +0000)]
Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7
am: 1f7fcb7970

Change-Id: I16e01dde45dd70cfb4ea43a81e728350a5b26d3f

6 years agoMerge "docs: Clarified description of height and width attrs" into oc-mr1-dev
Andrew Solovay [Mon, 30 Oct 2017 18:02:54 +0000 (18:02 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
am: ddad5593c2

Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559

6 years agoMerge "SysUI: disable quick QS when QS is disabled."
TreeHugger Robot [Mon, 30 Oct 2017 17:58:17 +0000 (17:58 +0000)]
Merge "SysUI: disable quick QS when QS is disabled."

6 years agoOWNERS: Prefer Jeff Sharkey's @android.com account over @google.com
Tobias Thierer [Mon, 30 Oct 2017 17:52:00 +0000 (17:52 +0000)]
OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com

He prefers to use his @android.com account.

Test: Treehugger
Bug: 63673347
Exempt-From-Owner-Approval: Allow @android.com to approve this CL :)

Change-Id: Ie80cc7864de7b91ae44ad57f0bae9b859d034803

6 years agoMerge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 17:51:37 +0000 (17:51 +0000)]
Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev

6 years agoMerge "Track moving of OkHttp facade API to new package."
Tobias Thierer [Mon, 30 Oct 2017 17:51:28 +0000 (17:51 +0000)]
Merge "Track moving of OkHttp facade API to new package."
am: 45183fc5a7

Change-Id: Ied0bf8a62be2dd2038adf3de2251419bf5f3e964

6 years agoBatteryService: restrict service notification logic
Yifan Hong [Fri, 27 Oct 2017 20:53:10 +0000 (13:53 -0700)]
BatteryService: restrict service notification logic

Record instance name in init() and compare in
Notification.onRegistration.

Test: pass
Bug: 63702641
Change-Id: I74ac5abba385275c46ccd65a4d963fc1d8a6279b

6 years agoMerge "docs: Clarified description of height and width attrs" into oc-mr1-dev
TreeHugger Robot [Mon, 30 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev

6 years agoFix PixelCopy readback
Stan Iliev [Fri, 27 Oct 2017 23:29:44 +0000 (19:29 -0400)]
Fix PixelCopy readback

Apply correct texture transform and use filter if source and dest
have different size.

Test: Ran and passed CtsUiRenderingTestCases,
Test: CtsGraphicsTestCases, CtsViewTestCases tests and the
Test: DecodeAccuracyTest.
Bug:68051015
Change-Id: Iee885e243e43497c9294f7475c0c5b9c1a783754

6 years agoMerge "Track moving of OkHttp facade API to new package."
Tobias Thierer [Mon, 30 Oct 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Track moving of OkHttp facade API to new package."

6 years agoTrack moving of OkHttp facade API to new package.
Tobias Thierer [Tue, 24 Oct 2017 23:58:29 +0000 (00:58 +0100)]
Track moving of OkHttp facade API to new package.

Another CL in this topic moves the classes from
  libcore.net.http
to
  com.squareup.okhttp.internalandroidapi.
In jarjar'ed build targets, this becomes
  com.android.okhttp.internalandroidapi.

This facade constitutes the API via which non-libcore parts
of the Android platform (currently framework) may access
OkHttp. It's moving because libcore.net.http is already
part of libcore, and the overlap of packages is problematic
for builds with EXPERIMENTAL_USE_OPENJDK9 set to true.

Bug: 68220880
Test: Treehugger
Change-Id: Ia79966563cc0b5ab0923d54c21e54b6192d8c990
Exempt-From-Owner-Approval: Jeff Sharkey is an owner, but only one of his accounts is listed as an owner (@android.com vs. @google.com)

6 years agoMerge "Suppress immersive mode cling in LockTask mode."
TreeHugger Robot [Mon, 30 Oct 2017 17:13:50 +0000 (17:13 +0000)]
Merge "Suppress immersive mode cling in LockTask mode."

6 years agoMerge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
Xi Han [Mon, 30 Oct 2017 17:11:13 +0000 (17:11 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."

6 years agoMerge "1/ Refactor out logic to fetch assist data asynchronously"
Winson Chung [Mon, 30 Oct 2017 16:22:26 +0000 (16:22 +0000)]
Merge "1/ Refactor out logic to fetch assist data asynchronously"

6 years agoMerge "Change overlay on background thread."
Lucas Dupin [Mon, 30 Oct 2017 16:11:40 +0000 (16:11 +0000)]
Merge "Change overlay on background thread."

6 years agoMerge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f9...
Adrian DC [Mon, 30 Oct 2017 16:09:28 +0000 (16:09 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f9d am: 18a6d4990a
am: 8590d905cb

Change-Id: I33dbafa88f84091d7b2a0c5f5ae2a63f026564f9

6 years agoMerge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f9d
Adrian DC [Mon, 30 Oct 2017 15:58:39 +0000 (15:58 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit" am: 47c83a5f9d
am: 18a6d4990a

Change-Id: I033cf9cf74c3fe8d80791cc5039a1530332eaabc