OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c
Shuo Qian [Wed, 17 Oct 2018 01:06:09 +0000 (18:06 -0700)]
Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c
am: a781751b32

Change-Id: Ib7d3dd0f7ce06edf736c493cde6778365c366ae2

5 years agoMerge "Make SubscriptionManager.getSlotIndex public"
Shuo Qian [Wed, 17 Oct 2018 00:54:52 +0000 (17:54 -0700)]
Merge "Make SubscriptionManager.getSlotIndex public"
am: 719310cd2c

Change-Id: Ia942ecfefef8f26ff0b1f140c0692c81aebd11fa

5 years agoMerge "Stop using DIST_DIR directly, use dist-for-goals instead" am: a8f2601d28
Dan Willemsen [Wed, 17 Oct 2018 00:50:55 +0000 (17:50 -0700)]
Merge "Stop using DIST_DIR directly, use dist-for-goals instead" am: a8f2601d28
am: 9b767e275e

Change-Id: I64a04f0c7b9220a8de872526ba37590b71fba458

5 years agoMerge "Stop using DIST_DIR directly, use dist-for-goals instead"
Dan Willemsen [Wed, 17 Oct 2018 00:43:35 +0000 (17:43 -0700)]
Merge "Stop using DIST_DIR directly, use dist-for-goals instead"
am: a8f2601d28

Change-Id: Iabb2ddb086dda71887c3d50152db50f813c9556a

5 years agoMerge "Make SubscriptionManager.getSlotIndex public"
Shuo Qian [Wed, 17 Oct 2018 00:37:35 +0000 (00:37 +0000)]
Merge "Make SubscriptionManager.getSlotIndex public"

5 years ago[automerger skipped] Merge "audioservice: fix a2dp connection race condition" am...
Eric Laurent [Wed, 17 Oct 2018 00:21:43 +0000 (17:21 -0700)]
[automerger skipped] Merge "audioservice: fix a2dp connection race condition" am: e568805209  -s ours
am: 6466847321  -s ours

Change-Id: I583507cfc59c088fab3efa6f71998eb96169c903

5 years agoMerge "Stop using DIST_DIR directly, use dist-for-goals instead"
Treehugger Robot [Wed, 17 Oct 2018 00:18:07 +0000 (00:18 +0000)]
Merge "Stop using DIST_DIR directly, use dist-for-goals instead"

5 years ago[automerger skipped] Merge "audioservice: fix a2dp connection race condition"
Eric Laurent [Wed, 17 Oct 2018 00:11:33 +0000 (17:11 -0700)]
[automerger skipped] Merge "audioservice: fix a2dp connection race condition"
am: e568805209  -s ours

Change-Id: Ifbb5cc5a8422f73e2f2eb2236d3f2865e4553986

5 years agoMerge "audioservice: fix a2dp connection race condition"
Treehugger Robot [Tue, 16 Oct 2018 23:49:35 +0000 (23:49 +0000)]
Merge "audioservice: fix a2dp connection race condition"

5 years agoMerge "iorap: Add presubmit/postsubmit support" am: 7cbabff3f0
Igor Murashkin [Tue, 16 Oct 2018 23:03:48 +0000 (16:03 -0700)]
Merge "iorap: Add presubmit/postsubmit support" am: 7cbabff3f0
am: ff3a8bf0f7

Change-Id: Iee75da6b590be3d04c591acce53389ed420190b1

5 years agoMerge "iorap: Add presubmit/postsubmit support"
Igor Murashkin [Tue, 16 Oct 2018 22:51:19 +0000 (15:51 -0700)]
Merge "iorap: Add presubmit/postsubmit support"
am: 7cbabff3f0

Change-Id: I5f5afb05cde2894fb62728e67943a3dc38f26594

5 years agoaudioservice: fix a2dp connection race condition
Eric Laurent [Thu, 14 Jun 2018 02:36:42 +0000 (19:36 -0700)]
audioservice: fix a2dp connection race condition

In case of fast (< 1 second) A2DP disconnect/connect sequence, there
is a potential race condition where the delayed disconnection message
(due to becoming noisy intent) is received after the not delayed
connection message.

- Make sure all messages related to device connection/disconnection
(including MSG_A2DP_DEVICE_CONFIG_CHANGE and MSG_BTA2DP_DOCK_TIMEOUT)
are handled by queueMsgUnderWakeLock().
- Make sure messages are processed in the same order as API calls.
- Add check for null address in makeA2dpDeviceUnavailableNow().

Bug: 109903807
Bug: 78837311
Test: repro steps in bugs. A2DP connection and playback

Change-Id: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0
(cherry picked from commit 3c4636c7127cd34728050d051ef3bd62829e877d)
Merged-In: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0

5 years agoMerge "iorap: Add presubmit/postsubmit support"
Treehugger Robot [Tue, 16 Oct 2018 22:21:33 +0000 (22:21 +0000)]
Merge "iorap: Add presubmit/postsubmit support"

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 "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 "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 "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 "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 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 "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 "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 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 "Start on DexBuilder"
Treehugger Robot [Tue, 16 Oct 2018 15:53:18 +0000 (15:53 +0000)]
Merge "Start on DexBuilder"

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
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
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
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
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
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 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 "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 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 "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 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

5 years agoMerge "Network-related commands porting"
Luke Huang [Tue, 16 Oct 2018 08:09:30 +0000 (01:09 -0700)]
Merge "Network-related commands porting"
am: 9b20115264

Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528

5 years agoMerge "Network-related commands porting"
Luke Huang [Tue, 16 Oct 2018 07:44:37 +0000 (07:44 +0000)]
Merge "Network-related commands porting"

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 06:50:41 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9da66855c6df5542a9d3273784941849a7d03693

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib157bd713ff9c0ad8504ff13a4ff4b91c75454be

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 05:31:12 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ice863cbfa1f7d3b678efc1c1c52023b1961e921a

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 05:12:33 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I26eb9affa49e0ec4a33d8af15636133eb55c926a

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

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib9833c6ccf62c26dfb73c08cd34b9a4d7178d7a9

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 04:59:06 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibf26d2b592cef0d579248cf122af92251819fe41

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Oct 2018 04:46:13 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I099acf9101592632383bc88dfff126c52f7965d0

5 years agoMerge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3
Ryan Prichard [Tue, 16 Oct 2018 04:25:35 +0000 (21:25 -0700)]
Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3
am: a34a1e0c97

Change-Id: Icf0d62124d88c87a76edcb9af945a2f327989a15

5 years agoMerge "Update robolectric dependency to v3.6.2." am: cc54c93376
Tobias Thierer [Tue, 16 Oct 2018 04:19:36 +0000 (21:19 -0700)]
Merge "Update robolectric dependency to v3.6.2." am: cc54c93376
am: 9ff0f548a9

Change-Id: I79a5efd92491c4d4ebcd16cd9d4fe9705760e483

5 years ago[automerger skipped] Merge "Add Feature Flag for Hearing Aid Profile" am: e4e653b8bf
Stanley Tng [Tue, 16 Oct 2018 04:14:01 +0000 (21:14 -0700)]
[automerger skipped] Merge "Add Feature Flag for Hearing Aid Profile" am: e4e653b8bf
am: 2350e15f4b  -s ours

Change-Id: Icda2f076515bcf48d03a3180d689d066f19d449c

5 years agoMove SDK Check for getNeighboringCellInfo
Nathan Harold [Tue, 16 Oct 2018 03:15:51 +0000 (20:15 -0700)]
Move SDK Check for getNeighboringCellInfo

Move the SDK check for getNeighboringCellInfo() to
inside the phone process for security.

Bug: 117520186
Test: atest CtsPermissionTestCasesSdk28
Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d

5 years agoMerge "Change ZipArchiveHandle from void* to ZipArchive*"
Ryan Prichard [Tue, 16 Oct 2018 02:06:02 +0000 (19:06 -0700)]
Merge "Change ZipArchiveHandle from void* to ZipArchive*"
am: f79542efd3

Change-Id: Iebca19f2757ae77c07eca46a721c6966621fea14

5 years agoMerge "Update robolectric dependency to v3.6.2."
Tobias Thierer [Tue, 16 Oct 2018 02:01:45 +0000 (19:01 -0700)]
Merge "Update robolectric dependency to v3.6.2."
am: cc54c93376

Change-Id: I671ee268daba3eea7922fb878de2d1e8963587bf

5 years agoMerge "Add Feature Flag for Hearing Aid Profile"
Stanley Tng [Tue, 16 Oct 2018 01:57:59 +0000 (18:57 -0700)]
Merge "Add Feature Flag for Hearing Aid Profile"
am: e4e653b8bf

Change-Id: I53ba5bf7547b66e29a0fbed7b5d596f010dd8a9b

5 years agoMerge "Change ZipArchiveHandle from void* to ZipArchive*"
Ryan Prichard [Mon, 15 Oct 2018 23:23:29 +0000 (23:23 +0000)]
Merge "Change ZipArchiveHandle from void* to ZipArchive*"

5 years agoChange ZipArchiveHandle from void* to ZipArchive*
Ryan Prichard [Thu, 11 Oct 2018 05:20:10 +0000 (22:20 -0700)]
Change ZipArchiveHandle from void* to ZipArchive*

Bug: none
Test: m checkbuild
Exempt-From-Owner-Approval: owner is OOO for another week,
  it's a fairly minor change to this repository
Change-Id: If4cf57619034ab98b06115ca60beb2fb26c4cd19

5 years agoMerge "Update robolectric dependency to v3.6.2."
Treehugger Robot [Mon, 15 Oct 2018 23:21:45 +0000 (23:21 +0000)]
Merge "Update robolectric dependency to v3.6.2."

5 years agoMerge "Fix overlap between operator name and heads-up notification" am: a3608c9116
Selim Cinek [Mon, 15 Oct 2018 23:18:20 +0000 (16:18 -0700)]
Merge "Fix overlap between operator name and heads-up notification" am: a3608c9116
am: 5013f1c08c

Change-Id: I786b5445e080a3fa9ae9ed90d023c5a6c5a812d5

5 years ago[automerger skipped] Merge changes into stage-aosp-master
chen xu [Mon, 15 Oct 2018 23:12:40 +0000 (16:12 -0700)]
[automerger skipped] Merge changes  into stage-aosp-master
am: b5983ecb29  -s ours

Change-Id: I14f88c998153e945516840acd7d3fbc765dd3357

5 years agoMerge "Add Feature Flag for Hearing Aid Profile"
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"

5 years ago[automerger skipped] Merge changes into stage-aosp-master
chen xu [Mon, 15 Oct 2018 23:08:29 +0000 (16:08 -0700)]
[automerger skipped] Merge changes  into stage-aosp-master
am: 25cdce89f4  -s ours

Change-Id: I00a27b03ba4c0061bce8c21940abb517aecdc48f

5 years agoMerge "Telephony light grey list clean up for Q" am: b9749f750f
chen xu [Mon, 15 Oct 2018 23:02:42 +0000 (16:02 -0700)]
Merge "Telephony light grey list clean up for Q" am: b9749f750f
am: 700b5c3062

Change-Id: I22775147345a2c2159f18c49a94ec7e9d2a314a3

5 years agoMerge "Fix overlap between operator name and heads-up notification"
Selim Cinek [Mon, 15 Oct 2018 22:56:13 +0000 (15:56 -0700)]
Merge "Fix overlap between operator name and heads-up notification"
am: a3608c9116

Change-Id: If09c46bba04bca2e2cda99173bc53a2d7e8488e7

5 years agoMerge changes into stage-aosp-master
Android Build Merger (Role) [Mon, 15 Oct 2018 22:44:53 +0000 (22:44 +0000)]
Merge changes  into stage-aosp-master

5 years agoMerge changes into stage-aosp-master
Android Build Merger (Role) [Mon, 15 Oct 2018 22:44:53 +0000 (22:44 +0000)]
Merge changes  into stage-aosp-master

5 years agoMerge "Telephony light grey list clean up for Q"
chen xu [Mon, 15 Oct 2018 22:44:17 +0000 (15:44 -0700)]
Merge "Telephony light grey list clean up for Q"
am: b9749f750f

Change-Id: Ia23066251baf4f1f876f7e80bfd31e465917d8dc

5 years agoFix flaky ScheduleCalendarTest
Beverly [Mon, 18 Jun 2018 20:42:14 +0000 (16:42 -0400)]
Fix flaky ScheduleCalendarTest

Accurately get the next day.

Test: atest com.android.server.notification.ScheduleCalendarTest
Fixes: 110355145

(cherry picked from commit fe099b59ec4d6e387837082310326a2a7564b2c3)

Test: Treehugger
Bug: 110355145

Change-Id: Idc20944679b44b30a40eb65d958df9fffec69375
Merged-In: Idc20944679b44b30a40eb65d958df9fffec69375

5 years agoStart on DexBuilder
Eric Holk [Thu, 20 Sep 2018 19:03:10 +0000 (12:03 -0700)]
Start on DexBuilder

This change begins work on DexBuilder, which will allow us to generate DEX files
directly from layouts. This version is rather limited, but we will expand its
functionality in future CLs. The DexBuilder in this CL can create a DEX file
from scratch, define classes, and define methods on those classes. Within
methods, it supports extremely simple instructions, such as storing a small
constant in a register and returning a value from a register. Additionally,
there are tests to make sure that at least at a structural level, the generated
DEX files are valid.

DexBuilder and its associated builder classes use functionality from
libartdexfile and the Dex Slicer tool to support the actual encoding of DEX
files.

Test: atest, also manually tested by loaded a generated DEX file in an Android
app and verifying its behavior.

Change-Id: Iaa01aa7e3a0c7e4d5f4fa8dbce1492499c93c222

5 years agoMerge "Fix overlap between operator name and heads-up notification"
Selim Cinek [Mon, 15 Oct 2018 22:15:19 +0000 (22:15 +0000)]
Merge "Fix overlap between operator name and heads-up notification"

5 years agoMerge "Telephony light grey list clean up for Q"
Treehugger Robot [Mon, 15 Oct 2018 21:54:19 +0000 (21:54 +0000)]
Merge "Telephony light grey list clean up for Q"

5 years agoMerge "Grant shell permission to manage accessibility" am: cf092a87c2
Phil Weaver [Mon, 15 Oct 2018 21:33:55 +0000 (14:33 -0700)]
Merge "Grant shell permission to manage accessibility" am: cf092a87c2
am: a28031b7da

Change-Id: I690233f012873d333f4ed4931f29e9c27223ab8f

5 years agoiorap: Add presubmit/postsubmit support
Igor Murashkin [Tue, 9 Oct 2018 21:56:33 +0000 (14:56 -0700)]
iorap: Add presubmit/postsubmit support

Also add support for temporarily disabling selinux
while running the iorap binder integration tests.

Test: atest --test-mapping frameworks/base/startop/iorap
Bug: 72170747
Change-Id: I0a5a006e28d4e1775aea4087c1b4731ebd3898a4

5 years agoMerge "Grant shell permission to manage accessibility"
Phil Weaver [Mon, 15 Oct 2018 21:20:13 +0000 (14:20 -0700)]
Merge "Grant shell permission to manage accessibility"
am: cf092a87c2

Change-Id: I0b73239b57d101a6be88a466b388ad74f0a32826

5 years agoMerge "Grant shell permission to manage accessibility"
Phil Weaver [Mon, 15 Oct 2018 20:53:39 +0000 (20:53 +0000)]
Merge "Grant shell permission to manage accessibility"

5 years agoFix overlap between operator name and heads-up notification
Tetsutoki Shiozawa [Wed, 5 Sep 2018 04:17:01 +0000 (13:17 +0900)]
Fix overlap between operator name and heads-up notification

The title of heads-up notification was shown incompletely
becaue it's covered by operator name.
To fix this issue, the operator name should be hidden
when a heads-up notification is shown.

Fixes: b/116533819
Test: atest SystemUITests
Test: manual - enable config_showOperatorNameInStatusBar
               and show a heads-up notification

Merged-In: Id3318cd7cb2c9b6950392fadd11d02ab873d84c5
Change-Id: Id3318cd7cb2c9b6950392fadd11d02ab873d84c5