OSDN Git Service
Bill Yi [Thu, 14 Sep 2017 00:54:20 +0000 (00:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours am:
4f8b486f69 -s ours am:
0dd2e975ca -s ours
am:
bcbc39e695 -s ours
Change-Id: I875a747924bd5f89ae7b73b6282bd9cd878c5c71
Bill Yi [Thu, 14 Sep 2017 00:47:57 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours am:
c0ccea9bf5 -s ours am:
4e72aa2314 -s ours
am:
797dca48c9 -s ours
Change-Id: Ie697f29340feabdd2f5c0c729afbe6ba571f119f
Bill Yi [Thu, 14 Sep 2017 00:39:22 +0000 (00:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours am:
318728fd6b -s ours am:
9ce3cc9c78 -s ours
am:
0973e9a34e -s ours
Change-Id: I7246fb14f24a8ed13fe663570672a95c196f4210
Bill Yi [Thu, 14 Sep 2017 00:35:58 +0000 (00:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours am:
697f149acf -s ours am:
b5b1b7b505 -s ours
am:
eb29e3e357 -s ours
Change-Id: Iebb6da5d93e09f986e8092107b363b869efd7a05
Android Build Merger (Role) [Thu, 14 Sep 2017 00:31:51 +0000 (00:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours am:
ac23d4afac -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:30:00 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours
am:
ac23d4afac -s ours
Change-Id: I3d314ff51d4294f927ef3eb7df257502c6326626
Android Build Merger (Role) [Thu, 14 Sep 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours am:
4c152ae488 -s ours am:
4379f07401 -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:26:44 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours am:
4c152ae488 -s ours
am:
4379f07401 -s ours
Change-Id: I9a4569287599b61d81034e0cc42cc446c8849cfd
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:23:39 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours am:
4f8b486f69 -s ours
am:
0dd2e975ca -s ours
Change-Id: I9ce1bd9180a009958d9dd60d794235869e28529a
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:17:51 +0000 (00:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours am:
c0ccea9bf5 -s ours
am:
4e72aa2314 -s ours
Change-Id: Ic6a131df00ed57b03414e7708e91bc7faf9bccc9
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 [Thu, 14 Sep 2017 00:11:20 +0000 (00:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours am:
318728fd6b -s ours
am:
9ce3cc9c78 -s ours
Change-Id: Ib3cf951855174e511b70e7e82fcf1041b654d9fd
Bill Yi [Thu, 14 Sep 2017 00:07:37 +0000 (00:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours am:
697f149acf -s ours
am:
b5b1b7b505 -s ours
Change-Id: I3d7a232e2eaa57bc3225857cec63b20fd1b1999e
Bill Yi [Thu, 14 Sep 2017 00:00:27 +0000 (00:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours
am:
1ff18ac097 -s ours
Change-Id: Ie004d9ef022c5297e783e2e79db6adc05c31c1d3
Bill Yi [Wed, 13 Sep 2017 23:56:54 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours
am:
4c152ae488 -s ours
Change-Id: I586e557c9257797642cafb7857ba1a2b60e3edee
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 23:11:18 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours
am:
4f8b486f69 -s ours
Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17
Bill Yi [Wed, 13 Sep 2017 23:05:48 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours
am:
c0ccea9bf5 -s ours
Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4
Bill Yi [Wed, 13 Sep 2017 23:00:37 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours
am:
318728fd6b -s ours
Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96
Bill Yi [Wed, 13 Sep 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours
am:
697f149acf -s ours
Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec
Bill Yi [Wed, 13 Sep 2017 22:48:33 +0000 (22:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours
am:
1db479ee26 -s ours
Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da
Bill Yi [Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
37f29b0359 -s ours
Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813
Bill Yi [Wed, 13 Sep 2017 22:44:20 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours
am:
9abe093864 -s ours
Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b
Bill Yi [Wed, 13 Sep 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
f9075cb448 -s ours
Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b
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
Bill Yi [Wed, 13 Sep 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c016ef25c8 -s ours
Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d
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 22:35:01 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9f5e95f64e -s ours
Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae
Bill Yi [Wed, 13 Sep 2017 22:30:34 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
79bfe12e6b -s ours
Change-Id: I5c0b3e5592d6e3912bdfbb264961fcc37b43a941
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:17:16 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e5fe30c1b0 -s ours
Change-Id: Ib28bd3a43d5fc857143345f25d63219f86149af5
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
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
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
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
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:36:45 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:36:15 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:35:32 +0000 (04:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:34:48 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:33:56 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:32:49 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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: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
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
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
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