OSDN Git Service
Bill Yi [Thu, 14 Sep 2017 02:27:53 +0000 (02:27 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours am:
74e9007c7b -s ours am:
5e220d0800 -s ours" into oc-mr1-dev
am:
00873a2e33 -s ours
Change-Id: Idd9a4ab6d9485b66ece4c2736d3ac41a2d20862c
Bill Yi [Thu, 14 Sep 2017 02:26:10 +0000 (02:26 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours am:
106e58f93c -s ours am:
9b4b22a52f -s ours" into oc-mr1-dev
am:
cdf80ad738 -s ours
Change-Id: Ifc7753e54b4ac8f2de7c8b01333e1a172a4791d6
Siyamed Sinir [Thu, 14 Sep 2017 02:24:00 +0000 (02:24 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-mr1-dev
am:
3ff708b6af
Change-Id: Ia63274cccfd553951c34a2ea357b0791668e6776
Dave Friedman [Thu, 14 Sep 2017 02:22:00 +0000 (02:22 +0000)]
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug:
38270718 am:
4b3a4b58ed am:
d1412d3d60
am:
b8ae843a20
Change-Id: Ic72fdc1f0833b8ebcd6d789cc2023266287dc341
George Mount [Thu, 14 Sep 2017 02:19:59 +0000 (02:19 +0000)]
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
am:
465a956066
Change-Id: Ieb8f17d3b1c345f27298dd4e461eaa7b780543b7
Sundeep Ghuman [Thu, 14 Sep 2017 02:18:01 +0000 (02:18 +0000)]
Merge "Change score cache eviction time to settings value." into oc-mr1-dev
am:
2193f912f3
Change-Id: Ifec764594fcaa858a81d52896cc501d56dcf20e0
Hangyu Kuang [Thu, 14 Sep 2017 02:15:00 +0000 (02:15 +0000)]
Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev
am:
7dd0c6924e
Change-Id: I6eef1bed8894f907177f21eb2550a9465b45c257
Bill Yi [Thu, 14 Sep 2017 02:07:03 +0000 (02:07 +0000)]
Import translations. DO NOT MERGE am:
ca913a6107 -s ours
am:
3349e61941 -s ours
Change-Id: I9dd126d72b4f35d7793e6a5e46ec809ca58c80dc
Bill Yi [Thu, 14 Sep 2017 02:04:14 +0000 (02:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
42203f5f7d -s ours
Change-Id: I267f548daf2b6ca55b110e776c11d347d6a8df26
Bill Yi [Thu, 14 Sep 2017 02:00:44 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f45cbb9a8a -s ours
Change-Id: I02b782480173b5e8b55b42de8598b948410b668c
Bill Yi [Thu, 14 Sep 2017 01:55:27 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
5483642730 -s ours
Change-Id: I6772b07cc948d7320ff082e12f0d50676795b9b7
Andrew Lehmer [Thu, 14 Sep 2017 01:52:07 +0000 (01:52 +0000)]
Merge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev
am:
1952fcffc3
Change-Id: I92b6d4ce3d1a17274809dfd123bea3ed56cd646c
Kurt Nelson [Thu, 14 Sep 2017 01:49:08 +0000 (01:49 +0000)]
Fix javadoc typo
am:
27616138bc
Change-Id: I5e55f645b757fd60b52cc50a223aa42ca65d0beb
Bryce Lee [Thu, 14 Sep 2017 01:22:56 +0000 (01:22 +0000)]
Merge "Update reference to top activity." into oc-mr1-dev
am:
f35bfc3d0c
Change-Id: Idd809abedb4e0a63bca117cdb6ce7ec89b6fa64a
Tomasz Wasilczyk [Thu, 14 Sep 2017 01:16:20 +0000 (01:16 +0000)]
Merge "Adjust AM/FM region ranges." into oc-mr1-dev
am:
af8d15f626
Change-Id: Ie773792e6c60cb004795420fc4f857f215967379
James Hawkins [Thu, 14 Sep 2017 01:11:43 +0000 (01:11 +0000)]
Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics." into oc-mr1-dev
am:
624f617d01
Change-Id: Ief37c97c762b72161684c0fe7be8c5e6dad42b2d
Tomasz Wasilczyk [Thu, 14 Sep 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Implement missing mute call." into oc-mr1-dev
am:
4f0dd2e689
Change-Id: I204c4288bdf0039b3f9c0e3743510cd95c12a97e
Ajay Nadathur [Thu, 14 Sep 2017 00:56:33 +0000 (00:56 +0000)]
Merge "Fix jank issue in Settings caused by fetching tile info" into oc-mr1-dev
am:
4562ecebc6
Change-Id: Ieedc4c25b8c2acfd03ef39c0bd2979b67c20e113
Andreas Gampe [Thu, 14 Sep 2017 00:52:54 +0000 (00:52 +0000)]
Merge "Binder: Change reaction to Error" into oc-mr1-dev
am:
bdcf8b6890
Change-Id: Ia600d9559d5bd76fbaccdc2fde5c7fd6d17dbc73
Lucas Dupin [Thu, 14 Sep 2017 00:42:13 +0000 (00:42 +0000)]
Merge "Do not play sounds when unlocking from AoD." into oc-mr1-dev
am:
dd68a88a51
Change-Id: Idd190bc16ed78da0322b3f963be29792c9fe6173
Kevin Chyn [Thu, 14 Sep 2017 00:35:18 +0000 (00:35 +0000)]
Merge "Log fingerprint unlock mode" into oc-mr1-dev
am:
953a464dd1
Change-Id: I9ae73021bdb25f0a8656a5429aaa49bb91d5e04b
Android Build Merger (Role) [Thu, 14 Sep 2017 00:24:55 +0000 (00:24 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours am:
74e9007c7b -s ours am:
5e220d0800 -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:22:26 +0000 (00:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours am:
74e9007c7b -s ours
am:
5e220d0800 -s ours
Change-Id: I3a646b1f624767fc735474111f2adc71523e5b72
Android Build Merger (Role) [Thu, 14 Sep 2017 00:19:15 +0000 (00:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours am:
106e58f93c -s ours am:
9b4b22a52f -s ours" into oc-mr1-dev
Siyamed Sinir [Thu, 14 Sep 2017 00:18:31 +0000 (00:18 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:16:30 +0000 (00:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours am:
106e58f93c -s ours
am:
9b4b22a52f -s ours
Change-Id: I862aadc444f81d8941b9e9378f36063de71c1872
Dave Friedman [Thu, 14 Sep 2017 00:11:57 +0000 (00:11 +0000)]
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug:
38270718 am:
4b3a4b58ed
am:
d1412d3d60
Change-Id: Ia63b719e65f0d82f7aa65fd4a74a442ffa27190d
Bill Yi [Wed, 13 Sep 2017 23:53:37 +0000 (23:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours
am:
74e9007c7b -s ours
Change-Id: I3a7afab3700da0464ca24e2aa5e7ac73b756855f
Bill Yi [Wed, 13 Sep 2017 23:49:38 +0000 (23:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours
am:
106e58f93c -s ours
Change-Id: I37e5c41fe54c5cc009da415395ae54e1c872f57d
Dave Friedman [Wed, 13 Sep 2017 23:42:48 +0000 (23:42 +0000)]
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug:
38270718
am:
4b3a4b58ed
Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af
TreeHugger Robot [Wed, 13 Sep 2017 23:17:37 +0000 (23:17 +0000)]
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 23:12:21 +0000 (23:12 +0000)]
Merge "Change score cache eviction time to settings value." into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 22:40:02 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours
am:
289d6b71a9 -s ours
Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc
Siyamed Sinir [Wed, 13 Sep 2017 19:19:41 +0000 (12:19 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I712abfe8d542cd1be9c1816f407c8912321ac480
(cherry picked from commit
2fd9f7a0fe80436e55f93dd0deb6baf7bd2901c3)
Bill Yi [Wed, 13 Sep 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours
am:
307f6a4d92 -s ours
Change-Id: Ibfc25bcb992c45a43c799412a7f47f6a12a77234
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
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
Bill Yi [Wed, 13 Sep 2017 20:49:32 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
222cc10fee -s ours
Change-Id: I711cdf888e217534fc50d3beae235cc516a28434
Daniel Cardenas [Wed, 13 Sep 2017 20:46:01 +0000 (20:46 +0000)]
Merge "Revert "Revert "Create new Audio include for TVs that doesn't have ringtones.""" into oc-mr1-dev
am:
cbda4cf6fb
Change-Id: Iaa8f24b08fb3ec5ed1fb8d246a215d2091b907c3
Julia Reynolds [Wed, 13 Sep 2017 20:42:55 +0000 (20:42 +0000)]
Merge "Trim invalid users" into oc-mr1-dev
am:
302a7bd34d
Change-Id: I4c02e8f71dfdad7eb69febe06fd23deed20a11d2
Julia Reynolds [Wed, 13 Sep 2017 20:37:49 +0000 (20:37 +0000)]
Merge "Don't crash system server" into oc-mr1-dev
am:
fedb3f6192
Change-Id: I7d9876ddc195840bbab12d1847f6cad3c88b3630
Nate Fischer [Wed, 13 Sep 2017 20:35:03 +0000 (20:35 +0000)]
Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev
am:
563cd2d3ca
Change-Id: I14aee03324a97717ebf109123c7a58649581ee11
Sundeep Ghuman [Tue, 29 Aug 2017 00:04:16 +0000 (17:04 -0700)]
Change score cache eviction time to settings value.
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.
Bug: b/
63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Merged-In: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Eric Schwarzenbach [Wed, 13 Sep 2017 20:23:19 +0000 (20:23 +0000)]
Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev
am:
7ccaa98fbb
Change-Id: If5de66f03f7bef4f14b4f44f8af5742d2a8fe1cc
George Mount [Mon, 11 Sep 2017 18:01:51 +0000 (11:01 -0700)]
Fix problem with empty AnimatorSet during fragment removal.
Bug:
65354043
When an empty AnimatorSet is used in a fragment animation,
it can end immediately. This CL properly detects this
case and handles it properly.
Test: manual, ran fragment CTS
Change-Id: I63bee3818106f9c8e86cdc94af61d6bc8407c789
Patrik Torstensson [Wed, 13 Sep 2017 20:16:16 +0000 (20:16 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev
am:
f876e789fd
Change-Id: If4c101905988549eb3f5f5dfa8a64ad03ae4048a
Bill Yi [Wed, 13 Sep 2017 20:07:25 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b484143b40 -s ours
Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb
TreeHugger Robot [Wed, 13 Sep 2017 19:55:54 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Janis Danisevskis [Wed, 13 Sep 2017 19:38:13 +0000 (19:38 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev
am:
b893b4b121
Change-Id: I72c674a64f60451bea762995804e23b3b035ade1
Rubin Xu [Wed, 13 Sep 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev
am:
f531f886fb
Change-Id: Id2afe1701b1c09e7a8d8070a2514e22d2213c61d
TreeHugger Robot [Wed, 13 Sep 2017 19:25:08 +0000 (19:25 +0000)]
Merge "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
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
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
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
Bryce Lee [Wed, 13 Sep 2017 17:13:44 +0000 (17:13 +0000)]
Merge "Update reference to top activity." into oc-mr1-dev
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
Dave Friedman [Thu, 15 Jun 2017 01:45:58 +0000 (18:45 -0700)]
Docs: Updating ANDROID_ID information to reflect Android O changes.
Bug:
38270718
Test: Verified on local build.
Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
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
Tomasz Wasilczyk [Wed, 13 Sep 2017 15:36:09 +0000 (15:36 +0000)]
Merge "Adjust AM/FM region ranges." into oc-mr1-dev
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
Tomasz Wasilczyk [Wed, 13 Sep 2017 14:47:45 +0000 (14:47 +0000)]
Merge "Implement missing mute call." into oc-mr1-dev
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
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
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
TreeHugger Robot [Wed, 13 Sep 2017 04:32:15 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:31:10 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-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
TreeHugger Robot [Wed, 13 Sep 2017 02:58:36 +0000 (02:58 +0000)]
Merge "Binder: Change reaction to Error" 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
Kevin Chyn [Wed, 13 Sep 2017 01:07:51 +0000 (01:07 +0000)]
Merge "Log fingerprint unlock mode" into oc-mr1-dev
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
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.
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
TreeHugger Robot [Tue, 12 Sep 2017 22:42:19 +0000 (22:42 +0000)]
Merge "Trim invalid users" 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
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
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)
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
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
TreeHugger Robot [Tue, 12 Sep 2017 21:51:37 +0000 (21:51 +0000)]
Merge "WebView: document Safe Browsing and shouldInterceptRequest" 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
Patrik Torstensson [Tue, 12 Sep 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" 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
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
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
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
Android Build Merger (Role) [Tue, 12 Sep 2017 17:29:11 +0000 (17:29 +0000)]
Merge "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 am:
517bb6eaa6" into oc-mr1-dev-plus-aosp
Beverly Tai [Tue, 12 Sep 2017 17:27:18 +0000 (17:27 +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
am:
517bb6eaa6
Change-Id: I8d89c0f195d37c1588fd7e1a77fcd97fb97fc775
Beverly Tai [Tue, 12 Sep 2017 17:26:56 +0000 (17:26 +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
am:
108e142d61
Change-Id: Ic7391a1b769b3621025b007dd07863cacea3af6e
Tomasz Wasilczyk [Tue, 12 Sep 2017 17:21:16 +0000 (10:21 -0700)]
Implement missing mute call.
Bug:
63534095
Test: instrumentation
Change-Id: I0a3b921acb2967c427e477dfd9c0faa6180b51c2
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
Beverly Tai [Tue, 12 Sep 2017 17:17:52 +0000 (17:17 +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: Ife88f86f94919d731e79f7ec5838b14fbb30a4cc
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
Abodunrinwa Toki [Tue, 12 Sep 2017 17:02:44 +0000 (17:02 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev
am:
bb3a812a71
Change-Id: I7c81e50fadfa2f2fc8d3c62c69250c0f9f618651
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
TreeHugger Robot [Tue, 12 Sep 2017 16:50:15 +0000 (16:50 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-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
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
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