OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Nav icons and quick step states are determined by service enabled" into pi-dev
Matthew Ng [Tue, 3 Apr 2018 21:58:29 +0000 (14:58 -0700)]
Merge "Nav icons and quick step states are determined by service enabled" into pi-dev
am: 6ae58e0d16

Change-Id: Ia392cc6ff8d1e39daf65f9594e575292ba57ed91

6 years agoMerge "Free up all scratch resources when the app's UI is hidden" into pi-dev
Derek Sollenberger [Tue, 3 Apr 2018 21:50:29 +0000 (14:50 -0700)]
Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev
am: 26f99b4cb7

Change-Id: I70ba8e5cda90bd468e47ceb7be8d51edab839cf5

6 years agoMerge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
Nathan Harold [Tue, 3 Apr 2018 21:41:56 +0000 (14:41 -0700)]
Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
am: 80a2bba9a6

Change-Id: Icd1b2cfc699ab44e4ca536b98298d5b23db7372e

6 years agoMerge "Support bypassing TLS in the framework" am: aef9956de2
Erik Kline [Tue, 3 Apr 2018 21:26:39 +0000 (14:26 -0700)]
Merge "Support bypassing TLS in the framework" am: aef9956de2
am: f12b9edf24

Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513

6 years agoMerge "Support bypassing TLS in the framework"
Erik Kline [Tue, 3 Apr 2018 21:17:23 +0000 (14:17 -0700)]
Merge "Support bypassing TLS in the framework"
am: aef9956de2

Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595

6 years agoMerge "Merge "Change signature of requestBluetoothAudio" into pi-dev am: 0929182dbf...
Android Build Merger (Role) [Tue, 3 Apr 2018 20:44:42 +0000 (20:44 +0000)]
Merge "Merge "Change signature of requestBluetoothAudio" into pi-dev am: 0929182dbf" into pi-dev-plus-aosp

6 years agoMerge "Change signature of requestBluetoothAudio" into pi-dev
Hall Liu [Tue, 3 Apr 2018 20:44:08 +0000 (13:44 -0700)]
Merge "Change signature of requestBluetoothAudio" into pi-dev
am: 0929182dbf

Change-Id: I18c6080f942188f7f04051f16b9f12fadbc75cbe

6 years agoMerge "Frameworks: In the kill handler, ensure the logging handler was run" am: c0ac9...
Andreas Gampe [Tue, 3 Apr 2018 20:41:25 +0000 (13:41 -0700)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run" am: c0ac9e916f
am: c9740fb393

Change-Id: Ie65982c54312c3eb854a4e663fe7bd0ff22c92c5

6 years agoMerge "Frameworks: In the kill handler, ensure the logging handler was run"
Andreas Gampe [Tue, 3 Apr 2018 20:29:06 +0000 (13:29 -0700)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run"
am: c0ac9e916f

Change-Id: Ica29cdf9a4b17b6cec957093c35b735d64568029

6 years agoMerge "Support bypassing TLS in the framework"
Treehugger Robot [Tue, 3 Apr 2018 19:56:19 +0000 (19:56 +0000)]
Merge "Support bypassing TLS in the framework"

6 years agoMerge "Add an Executor for the onConnectedListener" am: 0d1f7933a3
Ruchi Kandoi [Tue, 3 Apr 2018 19:28:43 +0000 (12:28 -0700)]
Merge "Add an Executor for the onConnectedListener" am: 0d1f7933a3
am: a6c7187242

Change-Id: I99338270ac10c27b68bd851a844259441145c186

6 years agoMerge "Add an Executor for the onConnectedListener"
Ruchi Kandoi [Tue, 3 Apr 2018 19:17:37 +0000 (12:17 -0700)]
Merge "Add an Executor for the onConnectedListener"
am: 0d1f7933a3

Change-Id: Ie1075238c6339c7964c14ef82f6db2d499ca03a3

6 years agoMerge "Nav icons and quick step states are determined by service enabled" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 18:47:22 +0000 (18:47 +0000)]
Merge "Nav icons and quick step states are determined by service enabled" into pi-dev

6 years agoMerge "Free up all scratch resources when the app's UI is hidden" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 18:41:17 +0000 (18:41 +0000)]
Merge "Free up all scratch resources when the app's UI is hidden" into pi-dev

6 years agoMerge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
Yangster-mac [Tue, 3 Apr 2018 18:27:50 +0000 (11:27 -0700)]
Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
am: 7219f8bac8

Change-Id: I04263e131472d5b0f0f3ffd408988d4b44a6b195

6 years agoMerge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
Nathan Harold [Tue, 3 Apr 2018 18:24:31 +0000 (18:24 +0000)]
Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev

6 years agoAdd AppOps Checks for MANAGE_IPSEC_TUNNELS
Nathan Harold [Fri, 16 Mar 2018 01:06:06 +0000 (18:06 -0700)]
Add AppOps Checks for MANAGE_IPSEC_TUNNELS

Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.

Bug: 66955045
Test: runtest frameworks-net
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4

6 years agoMerge "Change signature of requestBluetoothAudio" into pi-dev
Hall Liu [Tue, 3 Apr 2018 18:19:30 +0000 (18:19 +0000)]
Merge "Change signature of requestBluetoothAudio" into pi-dev

6 years agoMerge "Frameworks: In the kill handler, ensure the logging handler was run"
Treehugger Robot [Tue, 3 Apr 2018 18:13:45 +0000 (18:13 +0000)]
Merge "Frameworks: In the kill handler, ensure the logging handler was run"

6 years agoMerge "Add com.android.development to the package whitelist." into pi-dev
Nicolas Geoffray [Tue, 3 Apr 2018 17:57:47 +0000 (10:57 -0700)]
Merge "Add com.android.development to the package whitelist." into pi-dev
am: 9c9177eb6b

Change-Id: I44aafbc02236593bf9631e4909453f2cc357d03f

6 years agoMerge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 17:57:43 +0000 (17:57 +0000)]
Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev

6 years ago[automerger skipped] Merge "Address IMSI privacy issues." am: 644d5ea61c
Pankaj Kanwar [Tue, 3 Apr 2018 17:52:18 +0000 (10:52 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues." am: 644d5ea61c
am: 41864c2abe  -s ours

Change-Id: Ia4aa4e45b2c9c9cd988976a3d5208f5c2e0e0961

6 years ago[automerger skipped] Merge "Address IMSI privacy issues."
Pankaj Kanwar [Tue, 3 Apr 2018 17:47:04 +0000 (10:47 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues."
am: 644d5ea61c  -s ours

Change-Id: Iba8cba90d15937b7cd0ecd32a78636de8e008644

6 years ago[automerger skipped] Address IMSI privacy issues.
pkanwar [Tue, 3 Apr 2018 17:42:58 +0000 (10:42 -0700)]
[automerger skipped] Address IMSI privacy issues.
am: 26509cda7e  -s ours

Change-Id: I6d2790e3e86c874e88a75c08c1b296461e79fe33

6 years agoMerge "Add com.android.development to the package whitelist." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 17:40:33 +0000 (17:40 +0000)]
Merge "Add com.android.development to the package whitelist." into pi-dev

6 years agoMerge "Address IMSI privacy issues."
Pankaj Kanwar [Tue, 3 Apr 2018 17:33:40 +0000 (10:33 -0700)]
Merge "Address IMSI privacy issues."
am: 644d5ea61c

Change-Id: Ib64e54022279c886126477e152f9acd835d45913

6 years agoMerge "Camera: sort getCameraIdList output" into pi-dev
Yin-Chia Yeh [Tue, 3 Apr 2018 17:31:26 +0000 (10:31 -0700)]
Merge "Camera: sort getCameraIdList output" into pi-dev
am: 3275d9a004

Change-Id: I7914103dc8827ae5b02733d432d227612e9eb6ae

6 years agoMerge "Do not run peek animation when keyguard is fading" into pi-dev
Lucas Dupin [Tue, 3 Apr 2018 17:18:26 +0000 (10:18 -0700)]
Merge "Do not run peek animation when keyguard is fading" into pi-dev
am: 3e57c9f525

Change-Id: I90543988ee3465c30c79a1f90f238979cc009b8b

6 years agoMerge "Camera: sort getCameraIdList output" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 17:13:39 +0000 (17:13 +0000)]
Merge "Camera: sort getCameraIdList output" into pi-dev

6 years agoMerge "Do not run peek animation when keyguard is fading" into pi-dev
Lucas Dupin [Tue, 3 Apr 2018 17:07:03 +0000 (17:07 +0000)]
Merge "Do not run peek animation when keyguard is fading" into pi-dev

6 years agoMerge "Add an Executor for the onConnectedListener"
Ruchi Kandoi [Tue, 3 Apr 2018 16:48:18 +0000 (16:48 +0000)]
Merge "Add an Executor for the onConnectedListener"

6 years agoMerge "Add dedicated flag to control app image generation" into pi-dev
Mathieu Chartier [Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)]
Merge "Add dedicated flag to control app image generation" into pi-dev
am: 7ee86d1dbc

Change-Id: Ia6b87f484bfeb13d358b6283ad319d1d4aeba60c

6 years agoMerge "Make getText hidden and getWidth/getBounds public" into pi-dev
Seigo Nonaka [Tue, 3 Apr 2018 16:12:51 +0000 (09:12 -0700)]
Merge "Make getText hidden and getWidth/getBounds public" into pi-dev
am: 3a2d4143ee

Change-Id: I618167a2c5afc153a51444b09f315179ff2dc83a

6 years agoMerge "Address IMSI privacy issues."
Pankaj Kanwar [Tue, 3 Apr 2018 16:05:51 +0000 (16:05 +0000)]
Merge "Address IMSI privacy issues."

6 years agoMerge "Add dedicated flag to control app image generation" into pi-dev
Mathieu Chartier [Tue, 3 Apr 2018 16:04:32 +0000 (16:04 +0000)]
Merge "Add dedicated flag to control app image generation" into pi-dev

6 years agoMerge "Make getText hidden and getWidth/getBounds public" into pi-dev
Seigo Nonaka [Tue, 3 Apr 2018 15:54:49 +0000 (15:54 +0000)]
Merge "Make getText hidden and getWidth/getBounds public" into pi-dev

6 years agoFree up all scratch resources when the app's UI is hidden
Derek Sollenberger [Mon, 2 Apr 2018 17:36:45 +0000 (13:36 -0400)]
Free up all scratch resources when the app's UI is hidden

Bug: 73808481
Test: hwui_unit_tests
Change-Id: I9f191c776a936c1be40702ff0924c7ad054526d5

6 years agoAdd com.android.development to the package whitelist.
Nicolas Geoffray [Tue, 3 Apr 2018 15:51:56 +0000 (16:51 +0100)]
Add com.android.development to the package whitelist.

bug: 77477866
Test: m
Change-Id: I9ac27dd3e7ee0d764d61ab9a8d2ae1065ce151e5

6 years agoMerge "Icon updates (1 of many)" into pi-dev
Evan Laird [Tue, 3 Apr 2018 15:36:51 +0000 (08:36 -0700)]
Merge "Icon updates (1 of many)" into pi-dev
am: a583d12f3d

Change-Id: Ib9b7b0bd3a58f601224bb1a47c3e05b7fcf51892

6 years agoFrameworks: In the kill handler, ensure the logging handler was run
Andreas Gampe [Mon, 2 Apr 2018 21:00:47 +0000 (14:00 -0700)]
Frameworks: In the kill handler, ensure the logging handler was run

In the KillApplicationHandler for uncaught exceptions ensure that the
LoggingHandler has been run. This ensures logging when code directly
calls getUncaughtExceptionHandler().uncaughtException().

Bug: 29624607
Bug: 73380984
Test: m
Test: manual
Change-Id: I9c9216714b4cf029d7ed21e29313c0e802345337

6 years agoMerge "Icon updates (1 of many)" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 15:21:32 +0000 (15:21 +0000)]
Merge "Icon updates (1 of many)" into pi-dev

6 years agoMerge "Update javadocs for ImageDecoder and related" into pi-dev
Leon Scroggins [Tue, 3 Apr 2018 14:58:37 +0000 (07:58 -0700)]
Merge "Update javadocs for ImageDecoder and related" into pi-dev
am: 8880a9e0b9

Change-Id: I6dbd77cf51710d17bf0aefed453dd269e3abe1f5

6 years agoMerge "QS tile transition fixes." into pi-dev
Amin Shaikh [Tue, 3 Apr 2018 14:48:59 +0000 (07:48 -0700)]
Merge "QS tile transition fixes." into pi-dev
am: 600fe676f7

Change-Id: I938f26819970763dd65474167e8e6bee423da925

6 years agoMerge "Fix strings for QS header status." into pi-dev
Amin Shaikh [Tue, 3 Apr 2018 14:43:07 +0000 (07:43 -0700)]
Merge "Fix strings for QS header status." into pi-dev
am: bb5b42eee7

Change-Id: I6976723201ff21843e12910a818bd20b2188e257

6 years agoMerge "Update javadocs for ImageDecoder and related" into pi-dev
Leon Scroggins [Tue, 3 Apr 2018 14:43:01 +0000 (14:43 +0000)]
Merge "Update javadocs for ImageDecoder and related" into pi-dev

6 years agoMerge "QS tile transition fixes." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 14:30:10 +0000 (14:30 +0000)]
Merge "QS tile transition fixes." into pi-dev

6 years agoMerge "Fix strings for QS header status." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 14:27:32 +0000 (14:27 +0000)]
Merge "Fix strings for QS header status." into pi-dev

6 years agoMerge "Greylist AccessibilityInteractionClient methods" into pi-dev
Artem Iglikov [Tue, 3 Apr 2018 13:55:22 +0000 (06:55 -0700)]
Merge "Greylist AccessibilityInteractionClient methods" into pi-dev
am: d33b958ca0

Change-Id: I1b8f0255e70ae79fa1ffb7cb8c36f4c47ec19aed

6 years agoMerge "Greylist AccessibilityInteractionClient methods" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 13:42:42 +0000 (13:42 +0000)]
Merge "Greylist AccessibilityInteractionClient methods" into pi-dev

6 years agoMerge "Camera: Update external camera orientation guidelines" into pi-dev
Emilian Peev [Tue, 3 Apr 2018 13:16:44 +0000 (06:16 -0700)]
Merge "Camera: Update external camera orientation guidelines" into pi-dev
am: 7451945364

Change-Id: I20b0458dee57cc804346b7104834ba1a619a1eb2

6 years agoMerge "Camera: Update external camera orientation guidelines" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 12:57:19 +0000 (12:57 +0000)]
Merge "Camera: Update external camera orientation guidelines" into pi-dev

6 years agoAdd more APIs to hidden API light greylist
David Brazdil [Tue, 3 Apr 2018 12:40:25 +0000 (05:40 -0700)]
Add more APIs to hidden API light greylist
am: 78cea74881

Change-Id: Id1eb856211bc278cf999026d12861e1b5ba6f076

6 years agoGreylist AccessibilityInteractionClient methods
Artem Iglikov [Tue, 3 Apr 2018 11:57:26 +0000 (12:57 +0100)]
Greylist AccessibilityInteractionClient methods

These are used to clear accessibility cache in tests driven by
UIAutomator.

Bug: 77401534
Test: n/a
Change-Id: Id0bb808e94e0efdd8ddc59f94ddd5ea71394c8a2

6 years agoAdd more APIs to hidden API light greylist
David Brazdil [Tue, 3 Apr 2018 10:15:18 +0000 (11:15 +0100)]
Add more APIs to hidden API light greylist

Bug: 64382372
Bug: 77289927
Bug: 77487374
Bug: 74430927
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: I2a65babbef3ead001f37549c2c470b0e6c118ef3

6 years agoMerge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev
Bernie Innocenti [Tue, 3 Apr 2018 09:57:42 +0000 (02:57 -0700)]
Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev
am: 1bc47a4c1d

Change-Id: If8733a74e18ec6f39e46bdcb38757b74f91bc15e

6 years agoMerge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev
Bernie Innocenti [Tue, 3 Apr 2018 09:42:19 +0000 (09:42 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev

6 years agoMerge "Use user-defined data limits in multipath quota." into pi-dev
Remi NGUYEN VAN [Tue, 3 Apr 2018 08:22:53 +0000 (01:22 -0700)]
Merge "Use user-defined data limits in multipath quota." into pi-dev
am: 4ed5c186d1

Change-Id: Ic10e32c317f705477b72f3f696b1d8701804b73b

6 years agoMerge "Use user-defined data limits in multipath quota." into pi-dev
Remi NGUYEN VAN [Tue, 3 Apr 2018 08:07:08 +0000 (08:07 +0000)]
Merge "Use user-defined data limits in multipath quota." into pi-dev

6 years agoSupport bypassing TLS in the framework
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Support bypassing TLS in the framework

This change comprises the following parts:

    [1] android.net.dns.ResolvUtil, containing methods that encapsulate the
        use of the high bit in netids used in DNS resolution contexts.

    [2] Updates to captive portal apps to call the ResolvUtil method that
        enables DNS-over-TLS bypass for the captive portal app process.

Test: as follows
    - builds
    - flashes
    - boots
    - runtest frameworks-net passes
Bug: 64133961
Bug: 72345192

Change-Id: I2072c1f68d6978fa0d7e9d8693135a2c51bb0f87

6 years agoAPF: drop multicast ICMPv6 while in doze mode
Bernie Innocenti [Wed, 28 Mar 2018 11:11:49 +0000 (20:11 +0900)]
APF: drop multicast ICMPv6 while in doze mode

Some WiFi hotspots send excessive multicast IPv6 ping requests which
cause considerable power drain. Thus, drop all multicast ICMPv6 ping
requests while the device is in doze mode.

Bug: 66930077
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Test: manual - compared generated APF bytecode using apf_disassembler
Test: manual - force idle mode while sending multicast pings to device
Change-Id: I25dbf99985cf4413b4d0e3920d281fe6d663197a
(cherry picked from commit e2c70f8a6092f740ea10e7476b33860d756cf94f)

6 years agoMerge "Fix wrong linear navigation order when TalkBack is on" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 05:44:04 +0000 (22:44 -0700)]
Merge "Fix wrong linear navigation order when TalkBack is on" into pi-dev
am: 85d4aeb5c5

Change-Id: If0126648fb836078812f704d522111162f3d9007

6 years agoMerge "Fix wrong linear navigation order when TalkBack is on" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 05:31:10 +0000 (05:31 +0000)]
Merge "Fix wrong linear navigation order when TalkBack is on" into pi-dev

6 years agoUse user-defined data limits in multipath quota.
Remi NGUYEN VAN [Mon, 2 Apr 2018 01:16:50 +0000 (10:16 +0900)]
Use user-defined data limits in multipath quota.

When data plan information is not available, use user-defined data
warning or limit to estimate a reasonable multipath quota.

New version of change to avoid editing NetworkPolicyManagerService.

Test: Tests in go/ag/3828171 pass.
Bug: 72631572
Bug: 72877610
Change-Id: Ied4215a093377dc3322c4f18a83969d364c19b2a

6 years agoMerge "Fix PIP window going offset in landscape mode." into pi-dev
Tracy Zhou [Tue, 3 Apr 2018 05:11:20 +0000 (22:11 -0700)]
Merge "Fix PIP window going offset in landscape mode." into pi-dev
am: 18603cdf81

Change-Id: I489fcd7b889e3874b0ac6f43032ed0241b8545e2

6 years agoMerge "Add fileds to AppCrash and ANR atoms" into pi-dev
Chenjie Yu [Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev
am: 60a24b97f7

Change-Id: I45399dc23e13fc7030a66f6d6166d6f2434640ba

6 years ago[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev
Erik Kline [Tue, 3 Apr 2018 04:53:07 +0000 (21:53 -0700)]
[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev
am: 5a36b3b6ea  -s ours

Change-Id: I2a970420521d9447d71dedb373bcf3098afd3d02

6 years agoMerge "android:ui crash on longpress of empty tile" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 04:45:31 +0000 (21:45 -0700)]
Merge "android:ui crash on longpress of empty tile" into pi-dev
am: 7a8aac8c6e

Change-Id: I49deb50169e0245025caceb5bdf65f515f45ce8f

6 years agoMerge "Revert "Throw invalid cert exception when deprecated initRecoveryService metho...
Dmitry Dementyev [Tue, 3 Apr 2018 04:36:05 +0000 (21:36 -0700)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
am: 41d6d7c424

Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1

6 years agoMerge "Disabling print dumping for now." into pi-dev
Kweku Adams [Tue, 3 Apr 2018 04:21:31 +0000 (21:21 -0700)]
Merge "Disabling print dumping for now." into pi-dev
am: 4df40c827e

Change-Id: I8c44090b1f84a45d8a1a0e8a952cc540d54eacfb

6 years agoMerge "A test api to override carrier information" into pi-dev
Chen Xu [Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)]
Merge "A test api to override carrier information" into pi-dev
am: b71c76036c

Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e

6 years agoMerge "Signal view is no loner apart of this fragment Removing custom battery display...
Brad Stenning [Tue, 3 Apr 2018 03:41:26 +0000 (20:41 -0700)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
am: 1e617f5c20

Change-Id: Ifeccb66d335bc5413861732dfd434eea46ea53dc

6 years agoMerge "Expose the JNI scrypt function in a standalone Java class so we can use it...
Bo Zhu [Tue, 3 Apr 2018 03:36:36 +0000 (20:36 -0700)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev
am: 1364455fd7

Change-Id: I6fc53616ec67bbb2770541958745d10f766f8b3d

6 years agoMerge "Fix PIP window going offset in landscape mode." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 03:35:40 +0000 (03:35 +0000)]
Merge "Fix PIP window going offset in landscape mode." into pi-dev

6 years agoMerge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
Brad Stenning [Tue, 3 Apr 2018 03:31:58 +0000 (20:31 -0700)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
am: 943b315668

Change-Id: Ibbcfd7e79a81ec5961a8997cf5d209076d4fe43d

6 years agoMerge "Made a note that app names may not contain delimiter characters" into pi-dev
Gil O'Neil [Tue, 3 Apr 2018 03:27:23 +0000 (20:27 -0700)]
Merge "Made a note that app names may not contain delimiter characters" into pi-dev
am: c610677258

Change-Id: I9581a7af5f34111ee3608f3ec2088fc9b0fffdcd

6 years agoMerge "[automerger skipped] Use concrete CREATOR instance for parceling lists am...
Fyodor Kupolov [Tue, 3 Apr 2018 03:22:44 +0000 (20:22 -0700)]
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am: 4921986db7 am: 609bc2d63e am: 3f13ccee8c  -s ours" into pi-dev
am: 3e8e71d1ec  -s ours

Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b

6 years ago[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev
Remi NGUYEN VAN [Tue, 3 Apr 2018 03:15:50 +0000 (20:15 -0700)]
[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev
am: cccd67b574  -s ours

Change-Id: I49845b0bc0183d4d1a6c694a70e30a90a9a59759

6 years agoMerge "Camera: fix errorFlag logic" into pi-dev
Yin-Chia Yeh [Tue, 3 Apr 2018 03:05:25 +0000 (20:05 -0700)]
Merge "Camera: fix errorFlag logic" into pi-dev
am: 4ccefebb78

Change-Id: I179c350218f4c5083a32c043f86e8b30f428d4da

6 years agoMerge "Adding user accessor functions to UserManagerHelper." into pi-dev
Jovana Knezevic [Tue, 3 Apr 2018 02:58:05 +0000 (19:58 -0700)]
Merge "Adding user accessor functions to UserManagerHelper." into pi-dev
am: c3724b5e91

Change-Id: If7acce092d6360ca64f1a4115ebd59ef8d185435

6 years agoMerge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
Mihai Popa [Tue, 3 Apr 2018 02:53:48 +0000 (19:53 -0700)]
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
am: 285797a45a

Change-Id: I81474f04a8d33d2cf063aa0d89b7abca255d3864

6 years agoMerge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev
Derek Sollenberger [Tue, 3 Apr 2018 02:49:15 +0000 (19:49 -0700)]
Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev
am: 8ec341627c

Change-Id: I9c3ac77a3743afe6980cdaca8ce324d4913945b9

6 years agoMerge "Allow applications to query for foreground/background data usage." into pi-dev
Lorenzo Colitti [Tue, 3 Apr 2018 02:37:19 +0000 (19:37 -0700)]
Merge "Allow applications to query for foreground/background data usage." into pi-dev
am: 3cafea0701

Change-Id: I755f6d28c3e881fb2f6ee864f63eb2a080a1045d

6 years agoMerge "Add fileds to AppCrash and ANR atoms" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 02:31:27 +0000 (02:31 +0000)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev

6 years agoMerge changes Ia9df12fa,Ib114e8cb into pi-dev
Rob Carr [Tue, 3 Apr 2018 02:30:01 +0000 (19:30 -0700)]
Merge changes Ia9df12fa,Ib114e8cb into pi-dev
am: d8bfc71c6c

Change-Id: Iaf70839958e257d195cb0538b1951771a0c7790b

6 years agoMerge "Refactor isTetheringSupported() calls" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 02:25:49 +0000 (02:25 +0000)]
Merge "Refactor isTetheringSupported() calls" into pi-dev

6 years agoMerge "android:ui crash on longpress of empty tile" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 02:22:48 +0000 (02:22 +0000)]
Merge "android:ui crash on longpress of empty tile" into pi-dev

6 years agoMerge "Add ROLLBACK past signing cert capability." into pi-dev
Daniel Cashman [Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)]
Merge "Add ROLLBACK past signing cert capability." into pi-dev
am: 0594af6dc3

Change-Id: I4057024e5a9369f0dc9c5e3ada14d338202fb1c6

6 years agoMerge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
Android Build Merger (Role) [Tue, 3 Apr 2018 01:59:52 +0000 (01:59 +0000)]
Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp

* changes:
  Merge changes from topic "planz" into pi-dev am: 93e11759d6
  Obtain NPMS through helper method. am: a435ab5124

6 years agoMerge changes from topic "planz" into pi-dev
Jeff Sharkey [Tue, 3 Apr 2018 01:59:01 +0000 (18:59 -0700)]
Merge changes from topic "planz" into pi-dev
am: 93e11759d6

Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858

6 years agoMerge "Revert "Throw invalid cert exception when deprecated initRecoveryService metho...
TreeHugger Robot [Tue, 3 Apr 2018 01:55:30 +0000 (01:55 +0000)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev

6 years agoObtain NPMS through helper method.
Jeff Sharkey [Tue, 3 Apr 2018 01:52:26 +0000 (18:52 -0700)]
Obtain NPMS through helper method.
am: a435ab5124

Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc

6 years agoMerge "Change signature of requestBluetoothAudio" am: 545e20389d
Hall Liu [Tue, 3 Apr 2018 01:46:50 +0000 (18:46 -0700)]
Merge "Change signature of requestBluetoothAudio" am: 545e20389d
am: 442575f4f1

Change-Id: Ic10b762e04d74635663fa97f5879072ebe00eca9

6 years agoMerge "Disabling print dumping for now." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 01:36:23 +0000 (01:36 +0000)]
Merge "Disabling print dumping for now." into pi-dev

6 years agoMerge "Change signature of requestBluetoothAudio"
Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]
Merge "Change signature of requestBluetoothAudio"
am: 545e20389d

Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c

6 years agoFix PIP window going offset in landscape mode.
Tracy Zhou [Tue, 3 Apr 2018 01:19:43 +0000 (18:19 -0700)]
Fix PIP window going offset in landscape mode.

In landscape mode, PIP window can go offset while launching IME. We want to align the top of the PIP window with the top of the movement bounds in that case.

Change-Id: I7e89538c9a51d78294037b474caedcdf31edf7c4
Fixes: 77337070
Test: Manual test

6 years agoMerge ""Unlocked device required" javadoc clarification" into pi-dev
Brian C. Young [Tue, 3 Apr 2018 01:29:11 +0000 (18:29 -0700)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
am: 084f9aee9a

Change-Id: Icb6580e3c7ee5a1b5cbacbd99eb769e3f55b5d9a

6 years agoMerge "Exit the loop at the right time" into pi-dev
Todd Kennedy [Tue, 3 Apr 2018 01:20:20 +0000 (18:20 -0700)]
Merge "Exit the loop at the right time" into pi-dev
am: 6d24a1c8be

Change-Id: Idbf0953a3fb4dd38640009a0b213dace99a282c5

6 years agoMerge "A test api to override carrier information" into pi-dev
Chen Xu [Tue, 3 Apr 2018 01:14:24 +0000 (01:14 +0000)]
Merge "A test api to override carrier information" into pi-dev

6 years agoMove forward the alarm timestamp when config is added to statsd.
Yangster-mac [Mon, 2 Apr 2018 21:37:33 +0000 (14:37 -0700)]
Move forward the alarm timestamp when config is added to statsd.

Test: statsd test
BUG: b/77344187

Change-Id: Ieacffaa29422829b8956f2b3fcb2c647c8c3eed9

6 years agoMerge "Work on issue #74404949: Screen state usage API" into pi-dev
Dianne Hackborn [Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)]
Merge "Work on issue #74404949: Screen state usage API" into pi-dev
am: 886fc6aef0

Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd