OSDN Git Service

android-x86/frameworks-base.git
6 years agoBluetooth: fix GATT race conditions when using Handler
Jakub Pawlowski [Tue, 12 Sep 2017 21:48:30 +0000 (14:48 -0700)]
Bluetooth: fix GATT race conditions when using Handler

Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Merged-In: Id703cea0543626bdd5a583da95615b650bbcc331

6 years agoMerge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 21:21:11 +0000 (21:21 +0000)]
Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 21:08:10 +0000 (21:08 +0000)]
Import translations. DO NOT MERGE
am: ca913a6107  -s ours

Change-Id: Idc97f7644ef2f4de1e916a72e3b1c97b3dc62a86

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:55:54 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:25:08 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:12:55 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev
Andrew Lehmer [Wed, 13 Sep 2017 18:59:00 +0000 (18:59 +0000)]
Merge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev

6 years agoMediaMuxer: Fix a typo in java doc.
Hangyu Kuang [Wed, 13 Sep 2017 18:09:27 +0000 (11:09 -0700)]
MediaMuxer: Fix a typo in java doc.

Bug: 63965858
Test: None as just document.
Change-Id: I4c849a02c3b19d8cf23e92a960cfde023e213ca1

6 years agoFix javadoc typo
Kurt Nelson [Tue, 12 Sep 2017 22:40:23 +0000 (15:40 -0700)]
Fix javadoc typo

Change-Id: Id851e1752eba2f57ce7360619fee3b14417b053f
Docs: Fix typo in public StrictMode javadoc
Bug: 62204662
Test: make ds-docs

6 years agoMerge "Update reference to top activity." into oc-mr1-dev
Bryce Lee [Wed, 13 Sep 2017 17:13:44 +0000 (17:13 +0000)]
Merge "Update reference to top activity." into oc-mr1-dev

6 years agoUpdate reference to top activity.
Bryce Lee [Tue, 12 Sep 2017 16:50:35 +0000 (09:50 -0700)]
Update reference to top activity.

A condition dealing with a paused top activity references the last
paused activity rather than the top activity.

Bug: 65620111
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
Change-Id: Ie67cb8b103e7dec59b1c0b40a5bb35ef0c3cb2b7

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 15:38:39 +0000 (08:38 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I3492feda7b5cb3fdec702165f8990f546b0d9896

6 years agoMerge "Adjust AM/FM region ranges." into oc-mr1-dev
Tomasz Wasilczyk [Wed, 13 Sep 2017 15:36:09 +0000 (15:36 +0000)]
Merge "Adjust AM/FM region ranges." into oc-mr1-dev

6 years agoMerge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value...
James Hawkins [Wed, 13 Sep 2017 15:11:20 +0000 (15:11 +0000)]
Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics." into oc-mr1-dev

6 years agoMerge "Implement missing mute call." into oc-mr1-dev
Tomasz Wasilczyk [Wed, 13 Sep 2017 14:47:45 +0000 (14:47 +0000)]
Merge "Implement missing mute call." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 12:54:50 +0000 (05:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I071832de264161e255329c1fa0a690e3a36aa12e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 10:39:53 +0000 (03:39 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Iedbbaa565e66794586d64f9961b5567926d50e32

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 10:29:34 +0000 (03:29 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I019c359ed59734f67ca67f9dc732221cfee5c768

6 years agoMerge "Fix jank issue in Settings caused by fetching tile info" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 03:12:57 +0000 (03:12 +0000)]
Merge "Fix jank issue in Settings caused by fetching tile info" into oc-mr1-dev

6 years agoMerge "Binder: Change reaction to Error" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 02:58:36 +0000 (02:58 +0000)]
Merge "Binder: Change reaction to Error" into oc-mr1-dev

6 years agoMerge "Do not play sounds when unlocking from AoD." into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 02:24:50 +0000 (02:24 +0000)]
Merge "Do not play sounds when unlocking from AoD." into oc-mr1-dev

6 years agoMerge "Log fingerprint unlock mode" into oc-mr1-dev
Kevin Chyn [Wed, 13 Sep 2017 01:07:51 +0000 (01:07 +0000)]
Merge "Log fingerprint unlock mode" into oc-mr1-dev

6 years agoMerge "Revert "Revert "Create new Audio include for TVs that doesn't have ringtones...
Daniel Cardenas [Wed, 13 Sep 2017 00:31:37 +0000 (00:31 +0000)]
Merge "Revert "Revert "Create new Audio include for TVs that doesn't have ringtones.""" into oc-mr1-dev

6 years agoRevert "Revert "Create new Audio include for TVs that doesn't have ringtones.""
Daniel Cardenas [Wed, 13 Sep 2017 00:12:08 +0000 (17:12 -0700)]
Revert "Revert "Create new Audio include for TVs that doesn't have ringtones.""

This saves 5944K or almost 6MB on system partition.
Bug: 65572669
Test: build

This reverts commit 9deba686fa77696cff1e0bfed22080950cd86a1e.

6 years agoDo not play sounds when unlocking from AoD.
Lucas Dupin [Tue, 12 Sep 2017 23:02:45 +0000 (16:02 -0700)]
Do not play sounds when unlocking from AoD.

Playing tap target sounds when unlocking from AoD
make them overlap. Let's skip taps and only play
the "unlock" sound.

Change-Id: I381e13604c61938ceceac903a8e2a52bf9192bbe
Fixes: 64411995
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java

6 years agoMerge "Trim invalid users" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 22:42:19 +0000 (22:42 +0000)]
Merge "Trim invalid users" into oc-mr1-dev

6 years agoMerge "Don't crash system server" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 22:40:50 +0000 (22:40 +0000)]
Merge "Don't crash system server" into oc-mr1-dev

6 years agoLog fingerprint unlock mode
Kevin Chyn [Tue, 12 Sep 2017 00:34:33 +0000 (17:34 -0700)]
Log fingerprint unlock mode

It's hard to determine why sometimes after OTA/reboot the first FP
authenticated doesn't cause bouncer to appear. Suspect calculateMode()
is returning either MODE_NONE or MODE_ONLY_WAKE but hard to verify without
log

Bug: 62444020

Test: build and look at log
Change-Id: Ie0dd9cc88bf300b06f1c85124fe98de6d3a1e6ba

6 years agoTron/proto: Add ACTION and FIELD for logging the boot reason string value through...
James Hawkins [Tue, 12 Sep 2017 20:16:03 +0000 (13:16 -0700)]
Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics.

Bug: 63584589
Test: None
Change-Id: Iad6941df5a357e3a1471d446e9776d8412d9e215
(cherry picked from commit b1dc6ca8c9dd1c850b8f4cc2320591267eea7856)

6 years agoFix jank issue in Settings caused by fetching tile info
Ajay Nadathur [Tue, 12 Sep 2017 01:30:08 +0000 (18:30 -0700)]
Fix jank issue in Settings caused by fetching tile info

bug: 62713030
Test: Manually tested
Change-Id: I24c78d35c66cc2de7c3e43b1a7f7c0bda22545a6

6 years agoBinder: Change reaction to Error
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Change reaction to Error

Instead of aborting immediately with a native error, try to call
Thread.dispatchUncaughtException to trigger a Java-side abort.
Only fall back to the old strategy if this fails.

(cherry picked from commit 1cd76f5c93bc1e2409c880cade19a323cd999aed)

Bug: 64689630
Test: m
Test: manual test
Merged-In: If07a04d3769f3b9181c4736220333df9a2871a16
Change-Id: If07a04d3769f3b9181c4736220333df9a2871a16

6 years agoMerge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 21:51:37 +0000 (21:51 +0000)]
Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev

6 years agoMerge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev
Eric Schwarzenbach [Tue, 12 Sep 2017 21:21:44 +0000 (21:21 +0000)]
Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev

6 years agoMerge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev
Patrik Torstensson [Tue, 12 Sep 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev

6 years agoMerge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 20:13:45 +0000 (20:13 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev

6 years agoAdjust AM/FM region ranges.
Tomasz Wasilczyk [Tue, 12 Sep 2017 18:35:35 +0000 (11:35 -0700)]
Adjust AM/FM region ranges.

Bug: 64541927
Test: instrumentation
Change-Id: I4f4c0d21313ecf6b365bbea3544f6b44b2c6f417

6 years agoMerge "Patch incoming LinkProperties before it's visible to the outside" into oc...
TreeHugger Robot [Tue, 12 Sep 2017 18:05:32 +0000 (18:05 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev

6 years agoFix TimestampedScoredNetwork parceling logic.
Eric Schwarzenbach [Wed, 6 Sep 2017 18:53:07 +0000 (11:53 -0700)]
Fix TimestampedScoredNetwork parceling logic.

The old implementation used incompatible read/write logic. Fixes the
constructor to use readParcelable() instead of
CREATOR.createFromParcel(). Adds tests.

Bug: 65379063
Test: make -j40 RunSettingsLibRoboTests

Change-Id: I6a6c183fe065f36fcc8d4a25637f98dfdaad350d
Merged-In: I6a6c183fe065f36fcc8d4a25637f98dfdaad350d

6 years agoImplement missing mute call.
Tomasz Wasilczyk [Tue, 12 Sep 2017 17:21:16 +0000 (10:21 -0700)]
Implement missing mute call.

Bug: 63534095
Test: instrumentation
Change-Id: I0a3b921acb2967c427e477dfd9c0faa6180b51c2

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 17:18:01 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e  -s ours am: ff5a0512ec
am: 0392ba5f72

Change-Id: I84fe2d446aa887c2934224c772d5b0ab7b570f5b

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 17:08:07 +0000 (17:08 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e  -s ours
am: ff5a0512ec

Change-Id: Icd9cc186849eba7d03afe0456c92017be2f1dc4e

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:57:46 +0000 (16:57 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5
am: be95e1d91e  -s ours

Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570

6 years agoMerge "Log the "change selected text" gesture." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 16:50:15 +0000 (16:50 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:49:49 +0000 (16:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360
am: 4bdddadcc5

Change-Id: I0530a9ca24c432ee0a4af4861bad7976ca355070

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:41:18 +0000 (16:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093
am: 6cd1142360

Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:32:29 +0000 (16:32 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0
am: b4913b7093

Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:23:44 +0000 (16:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours
am: 5252746fe0

Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:15:49 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec
am: c64209fb6a  -s ours

Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6
am: ff058a78ec

Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours
am: d0d0fea3d6

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am: 89a94b706d  -s ours

Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36

6 years agoMerge "Update crash dialog icons to rounded versions" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev

6 years agoTrim invalid users
Julia Reynolds [Tue, 12 Sep 2017 13:43:57 +0000 (09:43 -0400)]
Trim invalid users

Change-Id: Ie7eab5c38ed7c6a58dcf2fa8c568fb576306852a
Fixes: 64725440
Test: runtest systemui-notification

6 years agoDon't crash system server
Julia Reynolds [Thu, 7 Sep 2017 17:53:40 +0000 (13:53 -0400)]
Don't crash system server

Change-Id: I6422017bf85f9751fe9bab3136e357b55e17c429
Fixes: 65374410
Test: make

6 years agoDO NOT MERGE Backporting potential usb tapjacking precaution.
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89

6 years agoMerge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev
Bryce Lee [Tue, 12 Sep 2017 14:20:50 +0000 (14:20 +0000)]
Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev

6 years agoLog the "change selected text" gesture.
Abodunrinwa Toki [Wed, 6 Sep 2017 21:05:18 +0000 (22:05 +0100)]
Log the "change selected text" gesture.

This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Merged-In: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a

6 years agoMerge "Fix smart selection logging bugs." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev

6 years agoPatch incoming LinkProperties before it's visible to the outside
Rubin Xu [Mon, 11 Sep 2017 14:21:10 +0000 (15:21 +0100)]
Patch incoming LinkProperties before it's visible to the outside

Otherwise we risk a race condition when we are fixing the LinkProperties
routes, other parts of ConnectivityService is reading the field at the
same time.

Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Bug: 65529483
Bug: 35995111

(cherry picked from commit 6c1f6fd78927514df73ddace81edac4899c4cda4)

Change-Id: I539578703570a901e0a5dff0155422ca78c52401

6 years agoMerge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 12:29:46 +0000 (12:29 +0000)]
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev

6 years agoMerge "Remove unused global references in JNI code supporting HwBinder." into oc...
TreeHugger Robot [Tue, 12 Sep 2017 10:26:40 +0000 (10:26 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev

6 years agoMerge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 07:36:24 +0000 (07:36 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev

6 years agoMerge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 07:26:35 +0000 (07:26 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev

6 years agoFix use of auth-bound keys after screen lock removal
Janis Danisevskis [Fri, 1 Sep 2017 21:45:16 +0000 (14:45 -0700)]
Fix use of auth-bound keys after screen lock removal

When an auth-bound key is used after the screen lock has been removed by
the user, KeyStore.begin retruns UNINITIALIZED.

This patch adds handling for this error code, indicating that the key
that was to be used was permanently invalidated.

Bug: 65200397
Test: CtsVerifier ScreenLockBoundKeysTest:
      1. Run test
      2. with CtsVerifier in the background remove the screen lock
         through the settings dialog
      3. Select VtsVerifier in 'recents'
      4. Run test again

Change-Id: If68ba0eb2f9c04655fe8c9eea28c4491eae8e92f
(cherry picked from commit d07d3384279c0c07c5c6747ea8d0c5684264c9d0)

6 years agoMerge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 03:00:38 +0000 (03:00 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82 am: 7359d93942  -s ours am: b2ba32be69  -s ours
am: 121df5bc6d  -s ours

Change-Id: I065099fb086c91124e7076a0d9df5782547cb1f3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 01:19:26 +0000 (01:19 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82 am: 7359d93942  -s ours
am: b2ba32be69  -s ours

Change-Id: I20a77b0ed8af5570b899080b80655e965ecc0502

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:45:19 +0000 (00:45 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82
am: 7359d93942  -s ours

Change-Id: I87dd0675b05119a349887e534ec639fc798709e3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:38:21 +0000 (00:38 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242
am: 4d91e69c82

Change-Id: Ie45e4da6e29b61481d6d43cc24530e5e0db7fa15

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74
am: 5288fcc242

Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e
am: 954b6e9b74

Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be
am: 8393b54d3e

Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0

6 years agoMerge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635
am: 064bfd22be

Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498
am: 6352ced635

Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6
am: 028ad8d498

Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34

6 years agoMerge "Fixed keyguard inflation problem" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am: 06183a57a6

Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev

6 years agoFix smart selection logging bugs.
Abodunrinwa Toki [Fri, 8 Sep 2017 20:11:49 +0000 (21:11 +0100)]
Fix smart selection logging bugs.

- Fix count with selection start index inside a word
- Properly handle whitespace characters
- Set the model version tag

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
Change-Id: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a4...
Siyamed Sinir [Mon, 11 Sep 2017 23:18:51 +0000 (23:18 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c
am: 491aaaae43

Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f

6 years agoWebView: document Safe Browsing and shouldInterceptRequest
Nate Fischer [Mon, 11 Sep 2017 22:42:28 +0000 (15:42 -0700)]
WebView: document Safe Browsing and shouldInterceptRequest

No change to logic, docs only.

This documents shouldInterceptRequest request behavior when Safe
Browsing is enabled, with recommendations for how this can be avoided
depending on the application's needs.

Bug: 65555402
Test: make docs (manually verify links all work)
Change-Id: I055254bfae3a06061402c519e8740ec4d9779e8f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am: 846a46043c

Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00

6 years agoMerge "Add some extra zygote preloads" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev

6 years agoRemove unused global references in JNI code supporting HwBinder.
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.

Bug: 63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java

6 years agoMake sure top activity is stopped on sleep if paused.
Bryce Lee [Mon, 11 Sep 2017 17:44:35 +0000 (10:44 -0700)]
Make sure top activity is stopped on sleep if paused.

Currently we have logic in place to handle moving a top resumed
activity to paused and eventually stopped if entering sleep. However,
we do not handle the case when the top activity is already paused.

This changelist addresses this issue by identifying this condition
and moving the activity to the stopped state.

Change-Id: Ib9fff1efeb33719d008508cf21a17b95fc17efd0
Fixes: 65457314
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff

6 years agoMerge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
Kevin Chyn [Mon, 11 Sep 2017 21:33:32 +0000 (21:33 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev

6 years agoFixed keyguard inflation problem
Lucas Dupin [Mon, 11 Sep 2017 19:28:03 +0000 (12:28 -0700)]
Fixed keyguard inflation problem

Inflating a keyguard while dettached from window would
raise a NullPointerException since window insets wouldn't
be available at the time.

Test: packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Change-Id: I7f48a62807877537814e6f34db1e6fa6fbec7923
Fixes: 65495303

6 years agoMerge "Fix flicker from multiwindow resize" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 21:19:41 +0000 (21:19 +0000)]
Merge "Fix flicker from multiwindow resize" into oc-mr1-dev

6 years agoRemove broken secondary dexopt during OTA
Shubham Ajmera [Fri, 8 Sep 2017 00:55:22 +0000 (17:55 -0700)]
Remove broken secondary dexopt during OTA

This is interim until the selinux policies get fixed.

Bug: 65067046
Test: make
(cherry-picked from commit b6156ca0f53d933b427d30e69aa2f638d4ecb88f)
Change-Id: Iea69e987ae451c80fa67065e08939e389efd2814

6 years agoHandle '&' in DexoptUtils#encodeClassLoader
Shubham Ajmera [Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)]
Handle '&' in DexoptUtils#encodeClassLoader

For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.

Removed the secondary dex file dexopt till we fixed it.

Bug: 65067046
Test: runtest.py -x \
  frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit 557c054935c0864b42ce49541d12d32ae6a797bc)
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0

6 years agoMerge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev
Evan Rosky [Mon, 11 Sep 2017 20:25:50 +0000 (20:25 +0000)]
Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev

6 years agoMerge "Fixed an issue where a notification could flicker" into oc-mr1-dev
Selim Cinek [Mon, 11 Sep 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev

6 years agoMerge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev
Zhi An Ng [Mon, 11 Sep 2017 19:32:10 +0000 (19:32 +0000)]
Merge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev

6 years agoMerge "Fixed a bug where parts weren't scrollable" into oc-mr1-dev
Selim Cinek [Mon, 11 Sep 2017 19:03:28 +0000 (19:03 +0000)]
Merge "Fixed a bug where parts weren't scrollable" into oc-mr1-dev

6 years agoAdd some extra zygote preloads
Mathieu Chartier [Sat, 9 Sep 2017 22:19:46 +0000 (15:19 -0700)]
Add some extra zygote preloads

Slow to initialize classes used by camera, instagram, facebook,
etc.

Obtained by go/ag/2877672 and looking at logcat during application
startup for: Camera, Instagram, Maps, and Facebook.

Test: build and flash
Bug: 65493113

Merged-In: Ic7a5641560e3b7de6f4db14f452d567104ce315c

(cherry picked from commit e4e553dab5e76b6f5aefcd274dfde98103e5004a)

Change-Id: Ie7837df6310496a3d840475aa7aa0ccba876efef

6 years agoMerge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev
Kevin Chyn [Mon, 11 Sep 2017 18:53:52 +0000 (18:53 +0000)]
Merge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev

6 years agoMerge "Fix nav bar color while QS customizing." into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 18:52:49 +0000 (18:52 +0000)]
Merge "Fix nav bar color while QS customizing." into oc-mr1-dev