OSDN Git Service
Lucas Dupin [Wed, 25 Oct 2017 01:15:24 +0000 (18:15 -0700)]
Customizable corner radius for dialogs
Moved default corner radius into an xml config to make it
overridable.
Test: make # launch usb debugging, wifi, and other system dialogs
Bug:
64122537
Change-Id: If9c102e37a6f998da2d97a8ad5aee2de4d25ae9d
TreeHugger Robot [Tue, 31 Oct 2017 21:13:53 +0000 (21:13 +0000)]
Merge "WebView: make notes in docs stand out"
TreeHugger Robot [Tue, 31 Oct 2017 21:07:55 +0000 (21:07 +0000)]
Merge "Fix testWindowProducerCopyToRGBA16F test on x86 emulator"
TreeHugger Robot [Tue, 31 Oct 2017 20:48:46 +0000 (20:48 +0000)]
Merge "WebView: document requirement for Activity Context"
TreeHugger Robot [Tue, 31 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Make CarrierConfigManager#KEY_CDMA_ROAMING_MODE public."
TreeHugger Robot [Tue, 31 Oct 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Allow dnd access for secondary users"
Charles He [Tue, 31 Oct 2017 20:08:56 +0000 (20:08 +0000)]
Merge "AM: make LockTask truly multi-task-aware."
Dianne Hackborn [Tue, 31 Oct 2017 19:55:42 +0000 (19:55 +0000)]
Merge "Fully implement "install" and "install-write" in PackageManagerShellCommand."
TreeHugger Robot [Tue, 31 Oct 2017 19:49:19 +0000 (19:49 +0000)]
Merge "AAPT2: Allow for nested inline xmls"
Android Build Merger (Role) [Tue, 31 Oct 2017 19:23:26 +0000 (19:23 +0000)]
Merge "Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c am:
d08f60ba71 am:
a3b1a48d4c"
Siyamed Sinir [Tue, 31 Oct 2017 19:21:57 +0000 (19:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c am:
d08f60ba71
am:
a3b1a48d4c
Change-Id: Id55dc21826e027094b3e5bdd445092f9474379bb
TreeHugger Robot [Tue, 31 Oct 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Simple numbering system selector for LocalePicker."
Siyamed Sinir [Tue, 31 Oct 2017 18:52:25 +0000 (18:52 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4 am:
43c494cb9c
am:
d08f60ba71
Change-Id: Ib7093da46b6aa094fc0b945802fc6f19bc39a2cf
Siyamed Sinir [Tue, 31 Oct 2017 18:36:58 +0000 (18:36 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375 am:
6ad6e7f2f4
am:
43c494cb9c
Change-Id: I398b3011295e2783f23ca7993cbca273fef38e47
Chong Zhang [Tue, 31 Oct 2017 18:34:51 +0000 (18:34 +0000)]
Merge "heif: support heif image sequence and dual-function files"
Michael Plass [Tue, 31 Oct 2017 18:33:05 +0000 (18:33 +0000)]
Merge "Metrics wifi.proto for connected wifi score"
Roozbeh Pournader [Tue, 31 Oct 2017 18:28:32 +0000 (18:28 +0000)]
Merge "Parse BCP 47 locale names with Unicode extensions"
Siyamed Sinir [Tue, 31 Oct 2017 18:21:55 +0000 (18:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375
am:
6ad6e7f2f4
Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Siyamed Sinir [Tue, 31 Oct 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991
am:
cc2fcef375
Change-Id: I6c7a98c8e38a38dcd9ea2aa423ee93dbd0f12ed4
Jeff Davidson [Wed, 25 Oct 2017 19:51:43 +0000 (12:51 -0700)]
Make CarrierConfigManager#KEY_CDMA_ROAMING_MODE public.
Mode constants have been moved to TelephonyManager.
Change-Id: I8c9091d9e71e1e38ff31e852301981f268b640cd
Fixes:
29163993
Test: TreeHugger only (no functional changes)
Michael Wachenschwanz [Tue, 31 Oct 2017 02:06:23 +0000 (19:06 -0700)]
AAPT2: Allow for nested inline xmls
Add recursion to InlineXmlFormatParser::Consume for handling nested
aapt:attr
Change-Id: Iabf98945b4f5ef22a3b8fdc4ca2bac092a377629
Fixes:
64385167
Test: make aapt2_tests
Siyamed Sinir [Tue, 31 Oct 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a
am:
9422f6e991
Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
Dianne Hackborn [Mon, 30 Oct 2017 21:19:32 +0000 (14:19 -0700)]
Fully implement "install" and "install-write" in PackageManagerShellCommand.
We can use the new mechanism to ask the calling shell to open
a file in order to implement the rest of these commands, allowing
you to give the path to an apk to install. That API is thus
extended to allow you to open readable files, not just opening
file for writing.
Doing this however means we no longer can pass a file path to
AssetManager for the apk to parse, we only have an already open
fd for that. Extending AssetManager to allow adding apks from
fds is not that hard, however, since the underlying zip library
already supports this.
This main thing this changes is in AssetManager.cpp where we
retrieve the open zip file for a particular apk that has been
added. This used to look up the zip file by path every time
it was needed, but that won't work anymore now that we can have
things added by fd. Instead, we keep track of each opened zip
in the AssetManager, so we can just directly retrieve it from
the asset_path representing the item that was added. As a
side-effect, this means for normal paths we no longer need to
look up by name, but just have the opened zip file directly
accessible. (This is probably good, but it does mean that we
no longer run the logic of seeing if the zip file's timestamp
has changed and re-opening it if it has. We probably shouldn't
be relying on that for an active AssetManager anyway, and maybe
it is even good that we don't allow the zip file to change
under it?)
A follow-up change will finally remove the Pm.java implementation
and turn the pm "command" into a simple shell script that runs
cmd package.
Test: manual
Change-Id: Ie103e3bdaa5b706796cc329254f2638151a3924f
TreeHugger Robot [Tue, 31 Oct 2017 17:52:52 +0000 (17:52 +0000)]
Merge "Display network name in status bar"
Siyamed Sinir [Tue, 31 Oct 2017 17:41:58 +0000 (17:41 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e
am:
b353fbcb7a
Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
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."
Siyamed Sinir [Tue, 31 Oct 2017 17:18:57 +0000 (17:18 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf
am:
eb863a6b2e
Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
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"
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
TreeHugger Robot [Tue, 31 Oct 2017 17:11:37 +0000 (17:11 +0000)]
Merge "Add metric constant for oem lock dialog"
Siyamed Sinir [Tue, 31 Oct 2017 17:05:15 +0000 (17:05 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856
am:
eeb90235bf
Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
TreeHugger Robot [Tue, 31 Oct 2017 17:02:59 +0000 (17:02 +0000)]
Merge "Fix failing/flaky TextViewActivityTests"
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
Siyamed Sinir [Tue, 31 Oct 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b
am:
bc56010856
Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
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
Siyamed Sinir [Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03
am:
1f8536653b
Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
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
Siyamed Sinir [Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a
am:
c275b77b03
Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
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
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
Siyamed Sinir [Tue, 31 Oct 2017 16:25:26 +0000 (16:25 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am:
a0c253d07a
Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
Siyamed Sinir [Tue, 31 Oct 2017 16:17:06 +0000 (16:17 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-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
Andrew Solovay [Tue, 31 Oct 2017 16:15:57 +0000 (16:15 +0000)]
Merge "docs: Fix documentation typo" into oc-mr1-dev
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
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"
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
Winson Chung [Tue, 31 Oct 2017 15:50:29 +0000 (15:50 +0000)]
Merge "Cleaning up InputConsumers"
Stan Iliev [Tue, 31 Oct 2017 15:47:54 +0000 (11:47 -0400)]
Fix testWindowProducerCopyToRGBA16F test on x86 emulator
Fix readback to return correct error code on X86 emulator, when
half float pixel format is not supported.
Test: Ran and passed all CtsViewTestCases tests on x86 emulator
Bug:
68383159
Change-Id: Id66484b73488e2c8d29fbecbd45a97af285a0710
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
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
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
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
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
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
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
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"
TreeHugger Robot [Tue, 31 Oct 2017 13:24:59 +0000 (13:24 +0000)]
Merge "Fix PixelCopy readback"
TreeHugger Robot [Tue, 31 Oct 2017 12:47:35 +0000 (12:47 +0000)]
Merge "Add App Op for changing WiFi State."
TreeHugger Robot [Tue, 31 Oct 2017 08:58:16 +0000 (08:58 +0000)]
Merge "Sync gauge metric proto to AOSP."
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."
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
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
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
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
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
Christine Franks [Tue, 31 Oct 2017 03:16:05 +0000 (03:16 +0000)]
Merge "Respect legacy color mode settings"
TreeHugger Robot [Tue, 31 Oct 2017 03:12:17 +0000 (03:12 +0000)]
Merge "Import translations. DO NOT MERGE"
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
TreeHugger Robot [Tue, 31 Oct 2017 03:06:49 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Oct 2017 03:04:50 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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
Hansong Zhang [Tue, 31 Oct 2017 02:40:45 +0000 (02:40 +0000)]
Merge "Fix Robolectric Bluetooth tests"
am:
01c9c0e4ba
Change-Id: I7987ddaa520c202a15af03bf0791c39a1720d3b3
Treehugger Robot [Tue, 31 Oct 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Fix Robolectric Bluetooth tests"
TreeHugger Robot [Tue, 31 Oct 2017 01:59:41 +0000 (01:59 +0000)]
Merge "Move the bluetooth icon logic to settingslib"
TreeHugger Robot [Tue, 31 Oct 2017 01:54:48 +0000 (01:54 +0000)]
Merge "incidentd: Preparing ActivityManagerService to dump meminfo."
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
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
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
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
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
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
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)
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
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
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
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
TreeHugger Robot [Mon, 30 Oct 2017 23:58:47 +0000 (23:58 +0000)]
Merge "Add more gradient info in VectorDrawable's javadoc"
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
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
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
TreeHugger Robot [Mon, 30 Oct 2017 23:45:31 +0000 (23:45 +0000)]
Merge "Renamed moveTaskToDockedStack to setTaskWindowingModeSplitScreenPrimary"
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
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
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
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
TreeHugger Robot [Mon, 30 Oct 2017 22:57:47 +0000 (22:57 +0000)]
Merge "Fix StateMachine init/quit race."
Chong Zhang [Mon, 30 Oct 2017 22:46:40 +0000 (22:46 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
OSDN Git Service
