OSDN Git Service

android-x86/frameworks-base.git
5 years agoSnapshot memory state for some native processes
Rafal Slawik [Mon, 15 Oct 2018 13:53:07 +0000 (14:53 +0100)]
Snapshot memory state for some native processes

Which processes to snapshot is controlled by a whitelist.

Benchmark for taking the snapshot:
https://docs.google.com/spreadsheets/d/1vG9ku8Uu8104CmKbO4cNeEKVeeByvHY--p0_dK1GAdA/edit?usp=sharing
(The difference between the first two sheets.)
~20ms constant cost plus ~4ms per process.

Bug: 115968899
Test: manually verified that statsd is included in the report
Change-Id: Iba680531c563ba28fae849e44044313866b2103f

5 years agoMerge "Add configurable default setting for assistant componentname"
Steve Elliott [Tue, 16 Oct 2018 21:05:23 +0000 (21:05 +0000)]
Merge "Add configurable default setting for assistant componentname"

5 years agoMerge "Pull process cpu stats into statsd"
Chenjie Yu [Tue, 16 Oct 2018 20:48:57 +0000 (20:48 +0000)]
Merge "Pull process cpu stats into statsd"

5 years agoMerge "Pass in window layout when setting initial state."
TreeHugger Robot [Tue, 16 Oct 2018 20:24:49 +0000 (20:24 +0000)]
Merge "Pass in window layout when setting initial state."

5 years agoMerge "Only skip stacks behind home when not in multi-window mode."
TreeHugger Robot [Tue, 16 Oct 2018 20:23:46 +0000 (20:23 +0000)]
Merge "Only skip stacks behind home when not in multi-window mode."

5 years agoOnly skip stacks behind home when not in multi-window mode.
Garfield Tan [Tue, 16 Oct 2018 16:42:02 +0000 (09:42 -0700)]
Only skip stacks behind home when not in multi-window mode.

Split screen primary stack is behind home (though visible to user), and
needs to respond to user tapping when out of touch region.

This doesn't cover the case where split screen stacks and freeform
stacks both exist in the display, but that's not a very common case on
any form factor.

Bug: 117777954
Bug: 117824834
Test: IME is brought up when Gmail is in split screen primary stack.
Tapping on home won't focus on home stack.
atest android.autofillservice.cts.MultiWindowLoginActivityTest#testSplitWindow

Change-Id: I44e17d9a0eba3ab6669ef75223c982ae0e811fc6

5 years agoMerge "Trust session id only if started with ACTION_CONFIRM_INSTALL"
TreeHugger Robot [Tue, 16 Oct 2018 19:46:21 +0000 (19:46 +0000)]
Merge "Trust session id only if started with ACTION_CONFIRM_INSTALL"

5 years agoTrust session id only if started with ACTION_CONFIRM_INSTALL
Suprabh Shukla [Wed, 10 Oct 2018 21:30:08 +0000 (14:30 -0700)]
Trust session id only if started with ACTION_CONFIRM_INSTALL

InstallStart was reading sessionInfo whenever the starting intent had
the extra EXTRA_SESSION_ID. This could happen even if an external app
inserted a valid session id into its own REQUEST_INSTALL_PACKAGE intent.
This allows apps to potentially spoof the calling package.

Test: Existing tests pass:
atest GtsPackageInstallTestCases GtsNoPermissionTestCases \
GtsNoPermissionTestCases25

Bug: 112031362
Change-Id: Icdab1deeaf6b0afe7a61709cd87305336c467e33

5 years agoMerge "Run alarms on a custom thread."
TreeHugger Robot [Tue, 16 Oct 2018 19:32:37 +0000 (19:32 +0000)]
Merge "Run alarms on a custom thread."

5 years agoMerge "Fixes ignoring interaction flags from launcher from race"
TreeHugger Robot [Tue, 16 Oct 2018 19:32:06 +0000 (19:32 +0000)]
Merge "Fixes ignoring interaction flags from launcher from race"

5 years agoMerge "Test deep transitions when an alarm is imminent."
TreeHugger Robot [Tue, 16 Oct 2018 19:12:43 +0000 (19:12 +0000)]
Merge "Test deep transitions when an alarm is imminent."

5 years agoMerge "DeviceIdleController light state transition tests."
TreeHugger Robot [Tue, 16 Oct 2018 19:11:04 +0000 (19:11 +0000)]
Merge "DeviceIdleController light state transition tests."

5 years agoMerge "[automerger skipped] Merge "[Graphics] Align Display P3 transfer function...
Android Build Merger (Role) [Tue, 16 Oct 2018 18:56:25 +0000 (18:56 +0000)]
Merge "[automerger skipped] Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba am: bc56d73af2 am: 93cd653b22  -s ours"

5 years agoMerge "Fix nondismissing vol dialog after config change"
TreeHugger Robot [Tue, 16 Oct 2018 18:55:48 +0000 (18:55 +0000)]
Merge "Fix nondismissing vol dialog after config change"

5 years ago[automerger skipped] Merge "[Graphics] Align Display P3 transfer function coefficient...
Peiyong Lin [Tue, 16 Oct 2018 18:55:48 +0000 (11:55 -0700)]
[automerger skipped] Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba am: bc56d73af2
am: 93cd653b22  -s ours

Change-Id: If1570d2a4b096932350a751cef4605144b8f04be

5 years agoMerge "Revert "Revert "Rootless GPU Debug for GLES"""
Cody Northrop [Tue, 16 Oct 2018 18:54:42 +0000 (18:54 +0000)]
Merge "Revert "Revert "Rootless GPU Debug for GLES"""

5 years agoRevert "Revert "Rootless GPU Debug for GLES""
Cody Northrop [Mon, 15 Oct 2018 13:22:23 +0000 (07:22 -0600)]
Revert "Revert "Rootless GPU Debug for GLES""

This reverts commit 2653e624dc7366f53b0ec946886d229a3602d92a.

Exempt-From-Owner-Approval: This restores a commit that was already
approved and rolled back for unrelated reasons in frameworks/native.

Test: cts-tradefed run singleCommand cts -m CtsGpuToolsHostTestCases
Test: Chromium starts up
Test: CtsDeqpTestCases:include-filter:dEQP-EGL.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES2.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES3.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES31.*
Bug: 110883880
Bug: 117609555
Change-Id: Iab23a5d598986ba34c0ba62dc78299d022924cd9

5 years agoMerge "Merge "Remove libcore/io members from light grey list" am: 2579dcd17e am:...
Android Build Merger (Role) [Tue, 16 Oct 2018 18:46:32 +0000 (18:46 +0000)]
Merge "Merge "Remove libcore/io members from light grey list" am: 2579dcd17e am: 1e69440dff am: f70e1edd6f"

5 years agoMerge "Remove libcore/io members from light grey list" am: 2579dcd17e am: 1e69440dff
Paul Duffin [Tue, 16 Oct 2018 18:44:33 +0000 (11:44 -0700)]
Merge "Remove libcore/io members from light grey list" am: 2579dcd17e am: 1e69440dff
am: f70e1edd6f

Change-Id: Id9e7ba83dace62281849e2dbfdb828ce176e9ef2

5 years agoMerge "Allow to configure local-only hotspot on 5ghz"
Pavel Maltsev [Tue, 16 Oct 2018 18:35:33 +0000 (18:35 +0000)]
Merge "Allow to configure local-only hotspot on 5ghz"

5 years agoMerge "Notify media.swcodec to load updated codes"
TreeHugger Robot [Tue, 16 Oct 2018 18:28:19 +0000 (18:28 +0000)]
Merge "Notify media.swcodec to load updated codes"

5 years agoMerge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba
Peiyong Lin [Tue, 16 Oct 2018 18:26:55 +0000 (11:26 -0700)]
Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba
am: bc56d73af2

Change-Id: Ib72ca917df3a778c4ad59dc46f672b482e8b62bf

5 years agoMerge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433 am: 8ae2674d04
Nathan Harold [Tue, 16 Oct 2018 18:25:44 +0000 (11:25 -0700)]
Merge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433 am: 8ae2674d04
am: 5ebc747848

Change-Id: I2ff73a3b4720131b1eb94df9c54c186c27c9f461

5 years agoMerge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433
Nathan Harold [Tue, 16 Oct 2018 18:19:07 +0000 (11:19 -0700)]
Merge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433
am: 660d68539a

Change-Id: Id9beb9fe1e6f7e464fe148a352192369fc1f38db

5 years agoMove SDK Check for getNeighboringCellInfo am: cb1c5ad25d
Nathan Harold [Tue, 16 Oct 2018 18:13:44 +0000 (11:13 -0700)]
Move SDK Check for getNeighboringCellInfo am: cb1c5ad25d
am: cd3d9a5ba9

Change-Id: I2226bcddceed70ab2b2328a42e7e0f1238017f88

5 years agoMerge "Remove libcore/io members from light grey list" am: 2579dcd17e
Paul Duffin [Tue, 16 Oct 2018 18:07:18 +0000 (11:07 -0700)]
Merge "Remove libcore/io members from light grey list" am: 2579dcd17e
am: 1e69440dff

Change-Id: I293723f450b71c12369dc97ea261e0f0a08e2b63

5 years agoMerge "[Graphics] Align Display P3 transfer function coefficients."
Peiyong Lin [Tue, 16 Oct 2018 18:03:47 +0000 (11:03 -0700)]
Merge "[Graphics] Align Display P3 transfer function coefficients."
am: fde18facba

Change-Id: I242a8f1ccf0d2b662d745a0a956da7e7c8e3d790

5 years agoMerge "Remove libcore/io members from light grey list"
Paul Duffin [Tue, 16 Oct 2018 17:52:03 +0000 (10:52 -0700)]
Merge "Remove libcore/io members from light grey list"
am: 2579dcd17e

Change-Id: I38392562cc62f90c0a9b37a0b0ceca4bf5ec976b

5 years agoMerge "[Graphics] Align Display P3 transfer function coefficients."
Peiyong Lin [Tue, 16 Oct 2018 17:49:00 +0000 (17:49 +0000)]
Merge "[Graphics] Align Display P3 transfer function coefficients."

5 years agoMerge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433
Nathan Harold [Tue, 16 Oct 2018 17:42:44 +0000 (10:42 -0700)]
Merge "Move SDK Check for getNeighboringCellInfo" am: 9ec58ff433
am: 8ae2674d04

Change-Id: Ie901a1fa9169addb46039c36326f391800ba56cb

5 years agoMerge "Fix issue with sort_api.sh" am: f943c52105 am: 66e9d98618
Paul Duffin [Tue, 16 Oct 2018 17:41:54 +0000 (10:41 -0700)]
Merge "Fix issue with sort_api.sh" am: f943c52105 am: 66e9d98618
am: 1a73c07ab4

Change-Id: I214977be62710e359839acd25fda1b22d7f043f8

5 years agoMerge "Move SDK Check for getNeighboringCellInfo"
Nathan Harold [Tue, 16 Oct 2018 17:37:27 +0000 (10:37 -0700)]
Merge "Move SDK Check for getNeighboringCellInfo"
am: 9ec58ff433

Change-Id: I67150a666533f9dd81951e5f00a3f49b2324ab19

5 years agoMove SDK Check for getNeighboringCellInfo
Nathan Harold [Tue, 16 Oct 2018 17:33:34 +0000 (10:33 -0700)]
Move SDK Check for getNeighboringCellInfo
am: cb1c5ad25d

Change-Id: I5f840dfa0f002e3d1b43426840a38221f02a10c2

5 years agoMerge "Fix stroke color for settings filter spinner"
Fan Zhang [Tue, 16 Oct 2018 17:31:54 +0000 (17:31 +0000)]
Merge "Fix stroke color for settings filter spinner"

5 years agoMerge "Remove libcore/io members from light grey list"
Treehugger Robot [Tue, 16 Oct 2018 17:31:33 +0000 (17:31 +0000)]
Merge "Remove libcore/io members from light grey list"

5 years agoMerge "Start on DexBuilder" am: 3e7d810a2f am: d4d3e215d7
Eric Holk [Tue, 16 Oct 2018 17:30:44 +0000 (10:30 -0700)]
Merge "Start on DexBuilder" am: 3e7d810a2f am: d4d3e215d7
am: d8a522c89c

Change-Id: I20614099a342c5ff2db14633c17672d471f72831

5 years agoMerge "Fix issue with sort_api.sh" am: f943c52105
Paul Duffin [Tue, 16 Oct 2018 17:27:27 +0000 (10:27 -0700)]
Merge "Fix issue with sort_api.sh" am: f943c52105
am: 66e9d98618

Change-Id: I230bec475595a84cba2c39e214b9e7195c2e0e1a

5 years agoMerge "Move SDK Check for getNeighboringCellInfo"
Nathan Harold [Tue, 16 Oct 2018 17:15:13 +0000 (10:15 -0700)]
Merge "Move SDK Check for getNeighboringCellInfo"
am: 9ec58ff433

Change-Id: Id9975df8d6531103a9c1fa2d77b42699f07b823c

5 years agoMerge "Start on DexBuilder" am: 3e7d810a2f
Eric Holk [Tue, 16 Oct 2018 17:14:19 +0000 (10:14 -0700)]
Merge "Start on DexBuilder" am: 3e7d810a2f
am: d4d3e215d7

Change-Id: I53a805e27818f4792b0ce18641d3b0710a0c7162

5 years agoMerge "Fix issue with sort_api.sh"
Paul Duffin [Tue, 16 Oct 2018 17:10:45 +0000 (10:10 -0700)]
Merge "Fix issue with sort_api.sh"
am: f943c52105

Change-Id: I196e57f5d5f96e5f5e1885e893be21ae81b75207

5 years agoMerge "setVolume() function using single input Test: run CTS"
Dichen Zhang [Tue, 16 Oct 2018 17:09:12 +0000 (17:09 +0000)]
Merge "setVolume() function using single input Test: run CTS"

5 years agoMerge "Disabled that wtfs crash when plugins are running"
Selim Cinek [Tue, 16 Oct 2018 16:54:52 +0000 (16:54 +0000)]
Merge "Disabled that wtfs crash when plugins are running"

5 years ago[Graphics] Align Display P3 transfer function coefficients.
Peiyong Lin [Mon, 15 Oct 2018 22:56:05 +0000 (15:56 -0700)]
[Graphics] Align Display P3 transfer function coefficients.

The transfer function of Display P3 should be sRGB transfer function,
previously we defined f as 0.039, however, the sRGB transfer function defines f
as 0.04045. This patch fixes it.

BUG: 116726537
Test: Build, flash and boot

Change-Id: I247092d8ce939aa743f23a1f8688cbaf0874fb99
Merged-In: I247092d8ce939aa743f23a1f8688cbaf0874fb99

5 years agoMerge "Move SDK Check for getNeighboringCellInfo"
Nathan Harold [Tue, 16 Oct 2018 16:50:22 +0000 (16:50 +0000)]
Merge "Move SDK Check for getNeighboringCellInfo"

5 years agoMerge "[Graphics] Align Display P3 transfer function coefficients."
Peiyong Lin [Tue, 16 Oct 2018 16:48:46 +0000 (16:48 +0000)]
Merge "[Graphics] Align Display P3 transfer function coefficients."

5 years agoMerge "Fix issue with sort_api.sh"
Treehugger Robot [Tue, 16 Oct 2018 16:47:08 +0000 (16:47 +0000)]
Merge "Fix issue with sort_api.sh"

5 years agoMerge changes I66e40b4b,I599a2ff9,I7c210623 am: 127421b2d0 am: 196af9bd14
Chalard Jean [Tue, 16 Oct 2018 16:44:37 +0000 (09:44 -0700)]
Merge changes I66e40b4b,I599a2ff9,I7c210623 am: 127421b2d0 am: 196af9bd14
am: 4778663ae7

Change-Id: I01b17de0482d9ea7d1bde5579cd707168e499cab

5 years agoMerge "Start on DexBuilder"
Eric Holk [Tue, 16 Oct 2018 16:42:45 +0000 (09:42 -0700)]
Merge "Start on DexBuilder"
am: 3e7d810a2f

Change-Id: I956b5edaefda774fe455180e133d5711a6d2f0f9

5 years agoMerge changes I66e40b4b,I599a2ff9,I7c210623 am: 127421b2d0
Chalard Jean [Tue, 16 Oct 2018 16:27:21 +0000 (09:27 -0700)]
Merge changes I66e40b4b,I599a2ff9,I7c210623 am: 127421b2d0
am: 196af9bd14

Change-Id: I97e98da931752c6267d0590ecb8b2ecffc3d603c

5 years agoMerge "Make loadSafeLabel a generic facility as makeSafeForPresentation"
TreeHugger Robot [Tue, 16 Oct 2018 16:21:10 +0000 (16:21 +0000)]
Merge "Make loadSafeLabel a generic facility as makeSafeForPresentation"

5 years agoMerge changes I66e40b4b,I599a2ff9,I7c210623
Chalard Jean [Tue, 16 Oct 2018 16:14:22 +0000 (09:14 -0700)]
Merge changes I66e40b4b,I599a2ff9,I7c210623
am: 127421b2d0

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275

5 years agoMerge "Remove usage of StringFactory"
Neil Fuller [Tue, 16 Oct 2018 16:06:32 +0000 (16:06 +0000)]
Merge "Remove usage of StringFactory"

5 years agoMerge "Start on DexBuilder"
Treehugger Robot [Tue, 16 Oct 2018 15:53:18 +0000 (15:53 +0000)]
Merge "Start on DexBuilder"

5 years agoFix nondismissing vol dialog after config change
Beverly [Tue, 16 Oct 2018 14:56:47 +0000 (10:56 -0400)]
Fix nondismissing vol dialog after config change

After a config change, the volume dialog calls init again
which sets mShowing to false.  After init is called in showH(),
mShowing should be set to true to reflect the actual state of
the volume dialog.

Test: manual
Change-Id: I0afd03eb33ff2a85856dbc0882fbd9ed46ac4c99
Fixes: 117797128

5 years agoMerge changes I66e40b4b,I599a2ff9,I7c210623
Treehugger Robot [Tue, 16 Oct 2018 14:48:33 +0000 (14:48 +0000)]
Merge changes I66e40b4b,I599a2ff9,I7c210623

* changes:
  [PT16] Simplification of sendProxyBroadcast.
  [PT15] Tiny bugfix in setGlobalProxy
  [PT14] No-op refactoring of sendProxyBroadcast

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 34c2fc...
Bill Yi [Tue, 16 Oct 2018 14:44:28 +0000 (07:44 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 34c2fcffac  -s ours
am: 87059c997d  -s ours

Change-Id: I622bec42749f2d09796ee420e9d8b7ebb58ef08a

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 14:37:26 +0000 (07:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 34c2fcffac  -s ours

Change-Id: I2e79e4fb105f480ceea1e7422846c6cda7499f49

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 14:20:55 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 29bc6e...
Bill Yi [Tue, 16 Oct 2018 13:58:06 +0000 (06:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 29bc6e6c1f  -s ours
am: ec2552b91a  -s ours

Change-Id: Iaf2a7143a3d346686976a375f04bd4f1e394dfe1

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e40728...
Bill Yi [Tue, 16 Oct 2018 13:56:55 +0000 (06:56 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e40728fd5f  -s ours
am: 9d32f7d80b  -s ours

Change-Id: I60afc08729822714aa80d5fe73a6163ee06620e2

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 78d7d2...
Bill Yi [Tue, 16 Oct 2018 13:55:29 +0000 (06:55 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 78d7d26052  -s ours
am: da862d5d20  -s ours

Change-Id: Ia79877cc1e3c9c2f5d2291de95ace253afca37d1

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b2ae8c...
Bill Yi [Tue, 16 Oct 2018 13:54:20 +0000 (06:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b2ae8c0c91  -s ours
am: 6cb353100b  -s ours

Change-Id: Ic12d64a47296873c3013acc8aa49a71f388b1e9b

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:51:46 +0000 (06:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 29bc6e6c1f  -s ours

Change-Id: Ie4ff4dece056127cef83d71aee12cfdb6dde121a

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 43fbd8...
Bill Yi [Tue, 16 Oct 2018 13:50:56 +0000 (06:50 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 43fbd8f5ab  -s ours
am: 62e971732c  -s ours

Change-Id: I34b2a2aab25f45f76666b336ace01db5ff21ac4b

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:50:16 +0000 (06:50 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: e40728fd5f  -s ours

Change-Id: Ie2811824ad02d9518c8e1ef534c062b21bf6038a

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97b444...
Bill Yi [Tue, 16 Oct 2018 13:49:45 +0000 (06:49 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97b4444838  -s ours
am: 7154c61365  -s ours

Change-Id: Id533922923497111e92a9481b149b613e296b066

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e56db6...
Bill Yi [Tue, 16 Oct 2018 13:48:30 +0000 (06:48 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e56db6bc7b  -s ours
am: d2881790df  -s ours

Change-Id: I9509718df32c23d4cf5dc101385e29b5ec7e12b4

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:46:59 +0000 (06:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 78d7d26052  -s ours

Change-Id: Ie5321ac9da5a10e8bbf8e3aa022533074fb0f521

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 400558...
Bill Yi [Tue, 16 Oct 2018 13:46:22 +0000 (06:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4005582181  -s ours
am: e04c77ae3b  -s ours

Change-Id: Ia5cfa7bd1086e6ae59eb969a4c7cd520285afb80

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:45:48 +0000 (06:45 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b2ae8c0c91  -s ours

Change-Id: I88584708530bc563afd004eec2449cf696104f05

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:44:35 +0000 (06:44 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 43fbd8f5ab  -s ours

Change-Id: I1ec715a6d39579677b8cd40996a48bf6fdd13a71

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:43:27 +0000 (13:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:42:59 +0000 (06:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 97b4444838  -s ours

Change-Id: I7a5a10cdd3f24205e95ea0e00e95ce2b11be8709

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:41:39 +0000 (06:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: e56db6bc7b  -s ours

Change-Id: Iad522c9d9198d2ce7d219806704019cde43176f8

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 16 Oct 2018 13:38:33 +0000 (06:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 4005582181  -s ours

Change-Id: I9afac55b6613e371c846f7064ddb11a4f4fee652

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:33:18 +0000 (13:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:31:26 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoRemove libcore/io members from light grey list
Paul Duffin [Tue, 16 Oct 2018 13:19:18 +0000 (14:19 +0100)]
Remove libcore/io members from light grey list

These members are now specified using the d.a.c.UnsupportedAppUsage
annotation on the members themselves.

Test: ensured that generated light grey list did not change
Bug: 117818301
Change-Id: I51c2f9544517b46d0b8821fbeb5b008342b99770

5 years agoFix issue with sort_api.sh
Paul Duffin [Tue, 16 Oct 2018 13:28:26 +0000 (14:28 +0100)]
Fix issue with sort_api.sh

Should use -ne not -neq.

Test: run script manually
Bug: 115609023
Change-Id: I337ed43be1f9250e6c2b2c88d97c68a5c9e8941c

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:27:36 +0000 (13:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:26:19 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:25:42 +0000 (13:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:23:48 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 16 Oct 2018 13:22:32 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years ago[automerger skipped] Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1 am: 97f1fa1688
Beverly [Tue, 16 Oct 2018 13:17:10 +0000 (06:17 -0700)]
[automerger skipped] Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1 am: 97f1fa1688
am: 690f5f81c6  -s ours

Change-Id: I9a0085d528ca9ed9751d03d23eb7f320b3fa7de8

5 years agoMerge "Add new "max-sdk-p blacklist"." am: adbc7dfc28 am: f0a45a4114
Mathew Inwood [Tue, 16 Oct 2018 13:10:51 +0000 (06:10 -0700)]
Merge "Add new "max-sdk-p blacklist"." am: adbc7dfc28 am: f0a45a4114
am: 94db534287

Change-Id: Ie0e9cfd4d0f0eff82736741a768f607872589244

5 years agoMerge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1
Beverly [Tue, 16 Oct 2018 12:59:18 +0000 (05:59 -0700)]
Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1
am: 97f1fa1688

Change-Id: I499a6152b42fb94deeeb88e1b90107f92eb4efa0

5 years agoMerge "Add new "max-sdk-p blacklist"." am: adbc7dfc28
Mathew Inwood [Tue, 16 Oct 2018 12:54:31 +0000 (05:54 -0700)]
Merge "Add new "max-sdk-p blacklist"." am: adbc7dfc28
am: f0a45a4114

Change-Id: I587c6c4a66b9a57c214668b9a72ac8cc50d1f219

5 years agoMerge "Fix flaky ScheduleCalendarTest"
Beverly [Tue, 16 Oct 2018 12:44:38 +0000 (05:44 -0700)]
Merge "Fix flaky ScheduleCalendarTest"
am: 08667cc9c1

Change-Id: If0c64d0a7b6f7a51f3a4d09b7ecf9cbad7ad6883

5 years agoMerge changes I0d33b4d3,I7034fcb2
Wale Ogunwale [Tue, 16 Oct 2018 12:39:09 +0000 (12:39 +0000)]
Merge changes I0d33b4d3,I7034fcb2

* changes:
  Moved some log config. to ActivityTaskManagerDebugConfig (21/n)
  Moved more stuff from AMS to ATMS (20/n)

5 years agoMerge "Add new "max-sdk-p blacklist"."
Mathew Inwood [Tue, 16 Oct 2018 12:38:00 +0000 (05:38 -0700)]
Merge "Add new "max-sdk-p blacklist"."
am: adbc7dfc28

Change-Id: Ice435ecdef532f3d25b705cc734773deba84322f

5 years agoRemove usage of StringFactory
Neil Fuller [Tue, 16 Oct 2018 12:24:15 +0000 (13:24 +0100)]
Remove usage of StringFactory

Code outside of the runtime should not use StringFactory.
The java.lang.String API works fine.

Bug: 113148576
Test: build only
Change-Id: I67ce6d7a13afd3ca7c0beffb33289d93e906e4be

5 years agoMerge "Fix flaky ScheduleCalendarTest"
Treehugger Robot [Tue, 16 Oct 2018 11:43:58 +0000 (11:43 +0000)]
Merge "Fix flaky ScheduleCalendarTest"

5 years agoMerge "Add new "max-sdk-p blacklist"."
Mathew Inwood [Tue, 16 Oct 2018 10:01:39 +0000 (10:01 +0000)]
Merge "Add new "max-sdk-p blacklist"."

5 years agoMerge "Remove BackupManagerServiceInterface"
TreeHugger Robot [Tue, 16 Oct 2018 10:01:08 +0000 (10:01 +0000)]
Merge "Remove BackupManagerServiceInterface"

5 years agoMerge "Network-related commands porting" am: 9b20115264 am: 923aa75d75
Luke Huang [Tue, 16 Oct 2018 09:32:50 +0000 (02:32 -0700)]
Merge "Network-related commands porting" am: 9b20115264 am: 923aa75d75
am: 11454a2163

Change-Id: I61fea40c9659f1eed1638cc196d309289393d6a5

5 years agoMerge "Network-related commands porting" am: 9b20115264
Luke Huang [Tue, 16 Oct 2018 09:19:35 +0000 (02:19 -0700)]
Merge "Network-related commands porting" am: 9b20115264
am: 923aa75d75

Change-Id: I957050b73afed3e6fde908883568b81198310622

5 years agoMerge "Fix invalid character access"
TreeHugger Robot [Tue, 16 Oct 2018 09:08:01 +0000 (09:08 +0000)]
Merge "Fix invalid character access"

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 08:48:38 +0000 (01:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I99af1ea374e4648979862922f7adea5d8b91ff81

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 08:42:01 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I213983e8a9a9f554aa6fc0002c55e31248278614