OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Move frameworks/base off the SRC_API_DIR variable." into pi-dev-plus-aosp
Anton Hansson [Mon, 23 Apr 2018 15:36:08 +0000 (15:36 +0000)]
Merge "Move frameworks/base off the SRC_API_DIR variable." into pi-dev-plus-aosp

6 years agoMerge "Revert "Temporarily whitelist platform test packages for hidden API"" into...
David Brazdil [Mon, 23 Apr 2018 15:17:13 +0000 (08:17 -0700)]
Merge "Revert "Temporarily whitelist platform test packages for hidden API"" into pi-dev
am: 8819dc8649

Change-Id: I20fba273e1dfa590dd9abbee2c4e482d708c4118

6 years agoMerge "Make settings icon invisible when QS is collapsed." into pi-dev
Amin Shaikh [Mon, 23 Apr 2018 15:10:56 +0000 (08:10 -0700)]
Merge "Make settings icon invisible when QS is collapsed." into pi-dev
am: 4a32b51800

Change-Id: I19fb5223a5715c83eb708431eaee8632cb960575

6 years agoMerge "Revert "Temporarily whitelist platform test packages for hidden API"" into...
David Brazdil [Mon, 23 Apr 2018 15:01:49 +0000 (15:01 +0000)]
Merge "Revert "Temporarily whitelist platform test packages for hidden API"" into pi-dev

6 years agoMerge "Make settings icon invisible when QS is collapsed." into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 14:56:01 +0000 (14:56 +0000)]
Merge "Make settings icon invisible when QS is collapsed." into pi-dev

6 years agoMerge "Thaw input dispatching immediately after unfreezing." into pi-dev
Bryce Lee [Mon, 23 Apr 2018 14:33:46 +0000 (07:33 -0700)]
Merge "Thaw input dispatching immediately after unfreezing." into pi-dev
am: b2bbf2f12c

Change-Id: I79c40a721840f018b3a5a6a861797a3f080f8896

6 years agoMerge "Consider lock state when determining next activity to become visible." into...
Bryce Lee [Mon, 23 Apr 2018 14:27:54 +0000 (07:27 -0700)]
Merge "Consider lock state when determining next activity to become visible." into pi-dev
am: 00f4a4bc74

Change-Id: Ied73f5090e5c790c884d817ac57399d70952ff6f

6 years agoMerge "Thaw input dispatching immediately after unfreezing." into pi-dev
Bryce Lee [Mon, 23 Apr 2018 14:09:54 +0000 (14:09 +0000)]
Merge "Thaw input dispatching immediately after unfreezing." into pi-dev

6 years agoMerge "Consider lock state when determining next activity to become visible." into...
Bryce Lee [Mon, 23 Apr 2018 14:08:29 +0000 (14:08 +0000)]
Merge "Consider lock state when determining next activity to become visible." into pi-dev

6 years agoMerge "Add null check for wireless charging animation." into pi-dev
Andrew Zeng [Mon, 23 Apr 2018 13:56:10 +0000 (06:56 -0700)]
Merge "Add null check for wireless charging animation." into pi-dev
am: fa404791b7

Change-Id: I4a2bd1700604c1c3aae757cf3f284354bd197aa8

6 years agoMerge "Add null check for wireless charging animation." into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 13:44:01 +0000 (13:44 +0000)]
Merge "Add null check for wireless charging animation." into pi-dev

6 years agoMerge "Remove prolonged animations" into pi-dev
Jorim Jaggi [Mon, 23 Apr 2018 13:18:02 +0000 (06:18 -0700)]
Merge "Remove prolonged animations" into pi-dev
am: 5bdf9530a0

Change-Id: Ie769ceea49d0e1cd877fb3fcb8d78ef08a9b635d

6 years agoMerge "Greylist test API for CtsSliceTestCases" into pi-dev
David Brazdil [Mon, 23 Apr 2018 13:13:18 +0000 (06:13 -0700)]
Merge "Greylist test API for CtsSliceTestCases" into pi-dev
am: 519249f472

Change-Id: I38608c11231780aeebce1e2354de503f288a8ae7

6 years agoMerge "Add light grey APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 13:08:16 +0000 (06:08 -0700)]
Merge "Add light grey APIs." into pi-dev
am: d60512c0d9

Change-Id: Ia27ffd286286188023e46e01d61b10cc3d2d13e9

6 years agoMerge "Add java.io.File fields to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 13:03:15 +0000 (06:03 -0700)]
Merge "Add java.io.File fields to light grey." into pi-dev
am: 1f4d564713

Change-Id: I03abe3ed09391145156395d0249c3f9e62d911bf

6 years agoMake settings icon invisible when QS is collapsed.
Amin Shaikh [Mon, 23 Apr 2018 12:52:38 +0000 (08:52 -0400)]
Make settings icon invisible when QS is collapsed.

Also fix calling super#onAttachedToWindow in QuickStatusBarHeader.

Change-Id: I2eb8c31b2d3a9ca20ac76608650a0e42ec25e504
Fixes: 78203022
Test: visual

6 years agoRevert "Temporarily whitelist platform test packages for hidden API"
David Brazdil [Mon, 23 Apr 2018 10:43:32 +0000 (11:43 +0100)]
Revert "Temporarily whitelist platform test packages for hidden API"

This reverts commit 6c5f36d3d9d82a390048eb386e0eca46cd9e1e2e.

Bug: 64382372
Bug: 74963051
Test: N/A
Change-Id: I8dc2b19c5d1ceee051791b639f30a1175b373117

6 years agoMerge "Remove prolonged animations" into pi-dev
Jorim Jaggi [Mon, 23 Apr 2018 12:17:37 +0000 (12:17 +0000)]
Merge "Remove prolonged animations" into pi-dev

6 years agoMerge "Greylist test API for CtsSliceTestCases" into pi-dev
David Brazdil [Mon, 23 Apr 2018 10:51:14 +0000 (10:51 +0000)]
Merge "Greylist test API for CtsSliceTestCases" into pi-dev

6 years agoMove frameworks/base off the SRC_API_DIR variable.
Anton Hansson [Thu, 19 Apr 2018 15:23:53 +0000 (16:23 +0100)]
Move frameworks/base off the SRC_API_DIR variable.

This directory is going away. Migrate to the new paths, and replace the
long list of "since" arguments with a loop in the makefile. Also fix the
soong buildfile to use the new path and the 28 prebuilts.

This removes the need to update it every time an API is finalized (in make,
I don't know how to make loops in soong).

Bug: 77525052
Test: Verified variable is the same before & after, except for path change
Change-Id: I1d4e87e7840e979b83779a2aefe176e7c1ed1527

6 years agoMerge "Add light grey APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:42:17 +0000 (10:42 +0000)]
Merge "Add light grey APIs." into pi-dev

6 years agoGreylist test API for CtsSliceTestCases
David Brazdil [Thu, 19 Apr 2018 15:32:48 +0000 (16:32 +0100)]
Greylist test API for CtsSliceTestCases

The test invokes two hidden methods inside a ContentProvider.
Since we cannot exempt those, add the two methods to light greylist
until they are made @TestApi.

Bug: 64382372
Test: run cts --module CtsSliceTestCases
Change-Id: I9bc0c23282c1744f4b93b9d84fcdd022f70859c2

6 years agoMerge "Add camera APIs to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:39:45 +0000 (03:39 -0700)]
Merge "Add camera APIs to light grey." into pi-dev
am: afc5b242d1

Change-Id: I3aad6b1fa8b9e1bc677910eb22dbc608bcefdd92

6 years agoMerge "Add light grey APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:34:42 +0000 (03:34 -0700)]
Merge "Add light grey APIs." into pi-dev
am: 144d5acdf5

Change-Id: Ic1a244e8007ec60dbbf25a5e2240d0586d88af0f

6 years agoMerge "Add java.io.File fields to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:33:39 +0000 (10:33 +0000)]
Merge "Add java.io.File fields to light grey." into pi-dev

6 years agoMerge "Add camera APIs to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:30:01 +0000 (10:30 +0000)]
Merge "Add camera APIs to light grey." into pi-dev

6 years agoMerge "Add light grey APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 10:23:09 +0000 (10:23 +0000)]
Merge "Add light grey APIs." into pi-dev

6 years agoMerge "Add APIs to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 09:25:32 +0000 (02:25 -0700)]
Merge "Add APIs to light grey." into pi-dev
am: bbfe498aef

Change-Id: I499733f055b02b5f09c5c03d5041bf4bc18154c9

6 years agoMerge "Add SELinux->getFileContext to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 09:20:12 +0000 (02:20 -0700)]
Merge "Add SELinux->getFileContext to light grey." into pi-dev
am: d7b98e1033

Change-Id: I6aa0047f7c8e4022d26ceebf3326bdb67549dcf1

6 years agoMerge "Light grey some APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 09:11:04 +0000 (02:11 -0700)]
Merge "Light grey some APIs." into pi-dev
am: b6f9d40495

Change-Id: I8d03769677dc5b32c8e8477c55844dce17a03152

6 years agoMerge "Add APIs to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 08:58:24 +0000 (08:58 +0000)]
Merge "Add APIs to light grey." into pi-dev

6 years agoMerge "Add SELinux->getFileContext to light grey." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 08:57:07 +0000 (08:57 +0000)]
Merge "Add SELinux->getFileContext to light grey." into pi-dev

6 years agoMerge "Light grey some APIs." into pi-dev
Nicolas Geoffray [Mon, 23 Apr 2018 08:56:52 +0000 (08:56 +0000)]
Merge "Light grey some APIs." into pi-dev

6 years agoMerge "Enforce permission when disabling API checks." into pi-dev
Mathew Inwood [Mon, 23 Apr 2018 08:16:42 +0000 (01:16 -0700)]
Merge "Enforce permission when disabling API checks." into pi-dev
am: 87f521ffe9

Change-Id: I9b87207cc9e337f1d3b293be7d9982f83381f5e6

6 years agoMerge "Enforce permission when disabling API checks." into pi-dev
Mathew Inwood [Mon, 23 Apr 2018 08:02:32 +0000 (08:02 +0000)]
Merge "Enforce permission when disabling API checks." into pi-dev

6 years agoMerge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
Chalard Jean [Mon, 23 Apr 2018 07:33:21 +0000 (00:33 -0700)]
Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
am: 2a915264a6

Change-Id: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811

6 years agoMerge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 07:22:12 +0000 (07:22 +0000)]
Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev

6 years agoLet DnsManager fill in LinkProperties for private DNSes
Chalard Jean [Wed, 11 Apr 2018 09:58:52 +0000 (18:58 +0900)]
Let DnsManager fill in LinkProperties for private DNSes

Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610

6 years agoMerge "Use settings flag to control HAL location request" into pi-dev
Yu-Han Yang [Mon, 23 Apr 2018 04:31:56 +0000 (21:31 -0700)]
Merge "Use settings flag to control HAL location request" into pi-dev
am: c9ae78dcde

Change-Id: I1b9f5ce5ab1d3f02a46764e230165d971eaebc0c

6 years agoMerge "Use settings flag to control HAL location request" into pi-dev
Yu-Han Yang [Mon, 23 Apr 2018 04:20:04 +0000 (04:20 +0000)]
Merge "Use settings flag to control HAL location request" into pi-dev

6 years agoMerge "Add nullchecks to ScreenPinningRequest." into pi-dev
Daichi Hirono [Mon, 23 Apr 2018 03:21:34 +0000 (20:21 -0700)]
Merge "Add nullchecks to ScreenPinningRequest." into pi-dev
am: c8303adb47

Change-Id: I31be7122fce932a1fed6730eb4181e6e809041b5

6 years agoMerge "Add nullchecks to ScreenPinningRequest." into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 03:13:03 +0000 (03:13 +0000)]
Merge "Add nullchecks to ScreenPinningRequest." into pi-dev

6 years agoMerge "Made the DrawableWrapper return the right ColorFilter" into pi-dev
Selim Cinek [Mon, 23 Apr 2018 02:49:04 +0000 (19:49 -0700)]
Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev
am: cf893ac40c

Change-Id: I60a5a5901a2eeb787d4750819130ded347808f8a

6 years agoMerge "Made the DrawableWrapper return the right ColorFilter" into pi-dev
Selim Cinek [Mon, 23 Apr 2018 02:26:58 +0000 (02:26 +0000)]
Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev

6 years agoMerge "Refactoring the User Switcher layout files to use dimensions in dimens_car...
Aarthi Balachander [Sun, 22 Apr 2018 04:18:13 +0000 (21:18 -0700)]
Merge "Refactoring the User Switcher layout files to use dimensions in dimens_car.xml and colors_car.xml so that overlays will be easier. Also, added a dialog when adding a user.  Fixed the issue where coming back to the user picker makes the buttons unresponsive" into pi-dev
am: e71fb69ec9

Change-Id: I42c08bbbfe1a85aa0feca3ea9a00e4891b480dd9

6 years agoMerge "Refactoring the User Switcher layout files to use dimensions in dimens_car...
TreeHugger Robot [Sun, 22 Apr 2018 04:06:59 +0000 (04:06 +0000)]
Merge "Refactoring the User Switcher layout files to use dimensions in dimens_car.xml and colors_car.xml so that overlays will be easier. Also, added a dialog when adding a user.  Fixed the issue where coming back to the user picker makes the buttons unresponsive" into pi-dev

6 years agoMerge "Use updated override config to notify listeners." into pi-dev
Garfield Tan [Sat, 21 Apr 2018 21:59:56 +0000 (14:59 -0700)]
Merge "Use updated override config to notify listeners." into pi-dev
am: 9036d61647

Change-Id: Ie4473df7f74979dfea872ca26ff163d4a2854ae2

6 years agoMerge "Use updated override config to notify listeners." into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 21:49:24 +0000 (21:49 +0000)]
Merge "Use updated override config to notify listeners." into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 21 Apr 2018 18:19:21 +0000 (11:19 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: e9549d0804  -s ours

Change-Id: I1faa7656a054811d4f8e8d3405aebdce6d0db629

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 18:11:36 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 21 Apr 2018 18:03:16 +0000 (11:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: d1eb0c0d91  -s ours

Change-Id: Ie870b3e660e929d8737dd04cb8a5431f26edc945

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 17:52:04 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev
Jack Yu [Sat, 21 Apr 2018 17:30:58 +0000 (10:30 -0700)]
Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev
am: 8f6568f908

Change-Id: I1ab715aa93609d653b689ef3570135d03c669cdf

6 years agoMerge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev
Jack Yu [Sat, 21 Apr 2018 17:18:52 +0000 (17:18 +0000)]
Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev

6 years agoMerge "Fixing issues with alpha 0.0 on parent view." into pi-dev
Jovana Knezevic [Sat, 21 Apr 2018 15:35:33 +0000 (08:35 -0700)]
Merge "Fixing issues with alpha 0.0 on parent view." into pi-dev
am: 1bcc95ef99

Change-Id: I42ad7eb35ce3c8d5c82c901b0392d55186785759

6 years agoMerge "Fixing issues with alpha 0.0 on parent view." into pi-dev
Jovana Knezevic [Sat, 21 Apr 2018 15:23:15 +0000 (15:23 +0000)]
Merge "Fixing issues with alpha 0.0 on parent view." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 21 Apr 2018 09:18:07 +0000 (02:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I42a13b075c1517f0ec1f8f79fd46ec54ee26008e

6 years agoThaw input dispatching immediately after unfreezing.
Bryce Lee [Sat, 21 Apr 2018 05:56:01 +0000 (22:56 -0700)]
Thaw input dispatching immediately after unfreezing.

Currently, we thaw after taking a number of steps post-unfreezing,
including setting up screen animations for rotation. If there is an
exception in this intermediate code, the input dispatching will not
be thawed even though the display has unfrozen.

This changelist moves thawing to immediately after unfreezing to
prevent it from being skipped due to an exception.

Bug: 78301580
Test: atest CtsActivityManagerDeviceTestCases
Change-Id: I32a3ca909fe1a495b361f9e5ba7b3a158837bc3a

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 21 Apr 2018 05:51:33 +0000 (22:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 58b8ca51d6  -s ours

Change-Id: I01f7781b27daf217cdce1f076351f35d6b716f80

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 05:42:29 +0000 (05:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 21 Apr 2018 04:40:27 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic17792437048be044201531e491b4ef280cf37f4

6 years agoMerge changes from topic "statsd_socket_review" into pi-dev
Yao Chen [Sat, 21 Apr 2018 02:56:54 +0000 (19:56 -0700)]
Merge changes from topic "statsd_socket_review" into pi-dev
am: 46fca44ee5

Change-Id: Iae06193a18ad48a664904dbd5bc26c5b4c7ae45f

6 years agoMerge changes from topic "statsd_socket_review" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 02:29:55 +0000 (02:29 +0000)]
Merge changes from topic "statsd_socket_review" into pi-dev

* changes:
  Add socket listener to statsd. And remove Davey atom.
  Allow StatsLog to directly write to statsd's socket.

6 years agoRefactoring the User Switcher layout files to use dimensions in
Aarthi Balachander [Fri, 20 Apr 2018 02:25:33 +0000 (19:25 -0700)]
Refactoring the User Switcher layout files to use dimensions in
dimens_car.xml and colors_car.xml so that overlays will be easier.
Also, added a dialog when adding a user.  Fixed the issue where coming
back to the user picker makes the buttons unresponsive

Test: tested on Mojave
Bug: 782442417830981678297334,
Change-Id: Iec44eb93ec4456be6d39d08940bb6ba2050eac7a

6 years agoMerge "DO NOT MERGE - Set country code even when device is not registered on network...
Jack Yu [Sat, 21 Apr 2018 01:37:36 +0000 (18:37 -0700)]
Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev
am: 4755c56965

Change-Id: I0602070b32e29a044ea24e08ad5ced6bc23cb795

6 years agoMerge "DO NOT MERGE - Set country code even when device is not registered on network...
Jack Yu [Sat, 21 Apr 2018 01:22:51 +0000 (01:22 +0000)]
Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev

6 years agoAdd socket listener to statsd. And remove Davey atom.
Yao Chen [Wed, 18 Apr 2018 20:48:02 +0000 (13:48 -0700)]
Add socket listener to statsd. And remove Davey atom.

+ The socket listener is behind a flag. It's disabled until we get sepolicy changes in.
+ Data parsing code is from logd, because we use the same format.

+ Removed Davey from JankTracker because it violates our new sepolicy

Test: manually
Bug: 78239479

Change-Id: Ib17729fbc362cdb13385f780e2d636a95adf9bc3

6 years agoMerge "Add composite string for battery summary in settings" into pi-dev
Salvador Martinez [Sat, 21 Apr 2018 00:30:06 +0000 (17:30 -0700)]
Merge "Add composite string for battery summary in settings" into pi-dev
am: a6b7a6fb33

Change-Id: Ia74ede8fb5f16c5ec89ca15e81b977ed272d9dda

6 years agoMerge "Add a function to get the secondary split screen bounds" into pi-dev
Matthew Ng [Sat, 21 Apr 2018 00:24:10 +0000 (17:24 -0700)]
Merge "Add a function to get the secondary split screen bounds" into pi-dev
am: 427e41bd07

Change-Id: I15b75499f92747cf7772eccada58887d40d98a06

6 years agoMerge "Extend adoptable override to force on or off." into pi-dev
Jeff Sharkey [Sat, 21 Apr 2018 00:20:16 +0000 (17:20 -0700)]
Merge "Extend adoptable override to force on or off." into pi-dev
am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039

6 years agoMerge "Don't require post-execution state for onActivityResult" into pi-dev
Andrii Kulian [Sat, 21 Apr 2018 00:10:42 +0000 (17:10 -0700)]
Merge "Don't require post-execution state for onActivityResult" into pi-dev
am: 5007c67a70

Change-Id: I6ea56c0e6e68afd354426194bd0d4536129abe86

6 years agoFixed CTS CtsUsageStatsTestCases test cases
Jack Yu [Fri, 20 Apr 2018 23:13:51 +0000 (16:13 -0700)]
Fixed CTS CtsUsageStatsTestCases test cases

We used the current RAT to load different carrier configuration to
determine whether the connection of a certain APN type is metered or
not. When the device is switched to IWLAN, the existing default
APN connection on cellular will be marked as unmetered based on
the current logic. This logic will be refactored when IWLAN full mode
is supported in Q.

For the short term workaround for P, we'll just mark default APN as
metered when the device is on IWLAN.

Test: CtsUsageStatsTestCases
Bug: 7454033677504652
Change-Id: Ib098e80d2bfd10e74c0b0dacf2cf2f217a66f7e4

6 years agoDO NOT MERGE - Set country code even when device is not registered on network
Jack Yu [Fri, 13 Apr 2018 21:05:32 +0000 (14:05 -0700)]
DO NOT MERGE - Set country code even when device is not registered on network

Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Change-Id: Ic7c9e903cc497b7e43b557cb593407ff3e9305b5

6 years agoMerge "Add composite string for battery summary in settings" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 23:27:25 +0000 (23:27 +0000)]
Merge "Add composite string for battery summary in settings" into pi-dev

6 years agoMerge "Add a function to get the secondary split screen bounds" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 23:27:12 +0000 (23:27 +0000)]
Merge "Add a function to get the secondary split screen bounds" into pi-dev

6 years agoMerge "Extend adoptable override to force on or off." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 23:24:28 +0000 (23:24 +0000)]
Merge "Extend adoptable override to force on or off." into pi-dev

6 years agoMerge "Don't require post-execution state for onActivityResult" into pi-dev
Andrii Kulian [Fri, 20 Apr 2018 23:21:25 +0000 (23:21 +0000)]
Merge "Don't require post-execution state for onActivityResult" into pi-dev

6 years agoUse updated override config to notify listeners.
Garfield Tan [Fri, 20 Apr 2018 23:19:03 +0000 (16:19 -0700)]
Use updated override config to notify listeners.

Bug: 77919579
Test: go/wm-smoke
Change-Id: I961aba587b9e193fbb9351aaa42c5633de49a367

6 years agoMerge "Fix issue with translucent animations" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 22:47:54 +0000 (15:47 -0700)]
Merge "Fix issue with translucent animations" into pi-dev
am: a93ab56ed8

Change-Id: Ieec6e5d765c1694e112187c330841c8c06edcd23

6 years agoMerge "Fix issue with translucent animations" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 22:32:59 +0000 (22:32 +0000)]
Merge "Fix issue with translucent animations" into pi-dev

6 years agoAllow StatsLog to directly write to statsd's socket.
Yao Chen [Wed, 18 Apr 2018 20:45:48 +0000 (13:45 -0700)]
Allow StatsLog to directly write to statsd's socket.

+ Reuse the log_event_list from liblog. StatsLog's binary format remains unchanged
+ Copied socket write code from liblog, including the retry logic.
+ Added build flags to control the StatsLog channel (logd, statsd, or both for debugging)

Bug: 78239479
Test: locally tested and saw logs being written to statsd

Change-Id: I7b1f0069ead00bbf3c29e4bd5b7f363a7ce26abe

6 years agoAdd null check for wireless charging animation.
Andrew Zeng [Fri, 20 Apr 2018 21:13:16 +0000 (14:13 -0700)]
Add null check for wireless charging animation.

StatusBarManagerService is not started in SystemServer on
wearable devices.

Bug: 78357692
Change-Id: I0e30a4996addb599b8c90aa86b5ccb5ee7d80490

6 years agoMerge "Give CTS a way to force-poll network stats." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 20:51:02 +0000 (13:51 -0700)]
Merge "Give CTS a way to force-poll network stats." into pi-dev
am: 46e58e1b40

Change-Id: Id2252b803a33ddadfef71618b3b9106c93c5be2a

6 years agoMerge "GetActiveNotifications should never return null" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 20:44:49 +0000 (13:44 -0700)]
Merge "GetActiveNotifications should never return null" into pi-dev
am: 66dfd01292

Change-Id: Iba293f70adda8e225d8b8c2f84465d95acbb18cf

6 years agoMerge "Give CTS a way to force-poll network stats." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 20:40:32 +0000 (20:40 +0000)]
Merge "Give CTS a way to force-poll network stats." into pi-dev

6 years agoMerge "GetActiveNotifications should never return null" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 20:21:41 +0000 (20:21 +0000)]
Merge "GetActiveNotifications should never return null" into pi-dev

6 years agoFixing issues with alpha 0.0 on parent view.
jovanak [Fri, 20 Apr 2018 19:35:09 +0000 (12:35 -0700)]
Fixing issues with alpha 0.0 on parent view.

Parent view should remain with 1.0 alpha.
Container view should fade when switching starts, and come back
to alpha of 1.0 once the switching has been completed.

Fixes: 78309123
Fixes: 78309400
Test: Visual confirmation of various flows. Switching to user with a pin. Canceling bouncer. Switching to user without a pin. Turning the screen off and back on after unlocking the user first.
Change-Id: I17946a1feea20bcb2fd2603c8cba0f2f51acd65d

6 years agoDon't require post-execution state for onActivityResult
Andrii Kulian [Thu, 19 Apr 2018 22:29:22 +0000 (15:29 -0700)]
Don't require post-execution state for onActivityResult

According to the documentation, onActivityResult() should be called
immediately before onResume(). This, however, was not always the case
in previous releases and fixing this caused some app compatibility
issues.
This CL removes required post execution state for ActivityResultItem.

Bug: 77695691
Test: ActivityLifecycleTests
Change-Id: Id8c02e9b49f9758aac616e37948570722d802de8

6 years ago[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev
Tobias Lindskog [Fri, 20 Apr 2018 19:48:52 +0000 (12:48 -0700)]
[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev
am: 6c2af1afa2  -s ours

Change-Id: I6eab8580911b7c84f21f4457d7fe3554110dd67e

6 years agoMerge "Fix layering of non-IME target windows in IME-target app in split-screen....
Robert Carr [Fri, 20 Apr 2018 19:41:15 +0000 (12:41 -0700)]
Merge "Fix layering of non-IME target windows in IME-target app in split-screen." into pi-dev
am: 12a6cd7457

Change-Id: Ie5b6c1967b4bfeed601fd7a32387ab8dbce0dc2a

6 years agoMerge "Catch double unbind of dead service" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 19:31:42 +0000 (19:31 +0000)]
Merge "Catch double unbind of dead service" into pi-dev

6 years agoMerge "Fix layering of non-IME target windows in IME-target app in split-screen....
TreeHugger Robot [Fri, 20 Apr 2018 19:29:15 +0000 (19:29 +0000)]
Merge "Fix layering of non-IME target windows in IME-target app in split-screen." into pi-dev

6 years agoMerge "Fix fraction and dimension type in Resource.proto" into pi-dev
Michael Wachenschwanz [Fri, 20 Apr 2018 19:25:47 +0000 (12:25 -0700)]
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev
am: 1a12311433

Change-Id: I2463fab9dd5705a4af11fa17aebf0c23c7c12d07

6 years agoExtend adoptable override to force on or off.
Jeff Sharkey [Fri, 20 Apr 2018 19:11:20 +0000 (13:11 -0600)]
Extend adoptable override to force on or off.

Virtual disks are adoptable by default, but for debugging purposes
we want to treat them as unadoptable in some cases.  Add the ability
for the "sm" shell command to force on/off, or return to default.

Bug: 7784965474132243
Test: manual
Change-Id: Ieda317396624ca081e5dd9568795483f684f9297

6 years agoMerge "SmartLinkify - handle keyboard clicks" into pi-dev
Abodunrinwa Toki [Fri, 20 Apr 2018 19:05:24 +0000 (12:05 -0700)]
Merge "SmartLinkify - handle keyboard clicks" into pi-dev
am: 686fab1464

Change-Id: I90f3d9ca20c9bb5a5f3c62da061e74d8517b5864

6 years agoAdd a function to get the secondary split screen bounds
Matthew Ng [Thu, 19 Apr 2018 00:14:22 +0000 (17:14 -0700)]
Add a function to get the secondary split screen bounds

Access through the overview proxy to get the bounds of the secondary
split screen app when split screen is enabled.

Test: manual
Fixes: 77678123
Change-Id: Iabbcf30dc7194ac6fff9b4d7cad8a9fe5ee48a2b

6 years agoMerge "Fix fraction and dimension type in Resource.proto" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 18:59:11 +0000 (18:59 +0000)]
Merge "Fix fraction and dimension type in Resource.proto" into pi-dev

6 years agoGetActiveNotifications should never return null
Julia Reynolds [Fri, 20 Apr 2018 17:33:36 +0000 (13:33 -0400)]
GetActiveNotifications should never return null

Test: runtest systemui-notification
Change-Id: I53e7a4a2a9f05318dd97ffb096658a4f8bcebc8a
Fixes: 70396956

6 years agoMerge "SmartLinkify - handle keyboard clicks" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 18:44:02 +0000 (18:44 +0000)]
Merge "SmartLinkify - handle keyboard clicks" into pi-dev

6 years agoMerge "Catch double unbind of dead service" am: 03cdc95f1c
Tobias Lindskog [Fri, 20 Apr 2018 18:42:45 +0000 (11:42 -0700)]
Merge "Catch double unbind of dead service" am: 03cdc95f1c
am: e0d33bc32e

Change-Id: Id994365fa971ecb722d4314b436e2c2bcacf3bf8