Commit Graph

82206 Commits

Author SHA1 Message Date
Nate Fischer
6ad362b160 Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev
am: 0899236129

Change-Id: I7ef05d97811a5ca15a3bfc01d8743c28fbefd243
2017-08-31 02:40:22 +00:00
TreeHugger Robot
0899236129 Merge "WebView: fix setSafeBrowsingWhitelist table in docs" into oc-mr1-dev 2017-08-31 02:28:11 +00:00
Kang Li
adc714972a Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
am: f10b0d000e

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947
2017-08-31 00:52:18 +00:00
TreeHugger Robot
f10b0d000e Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev 2017-08-31 00:34:57 +00:00
jackqdyulei
9950104f7a Merge "Add static lock in PowerProfile" into oc-mr1-dev
am: dcadf1934a

Change-Id: I3ae1a99852d5c9c4a87ee402b3e2e1cc88b8bd0d
2017-08-31 00:06:06 +00:00
TreeHugger Robot
dcadf1934a Merge "Add static lock in PowerProfile" into oc-mr1-dev 2017-08-30 23:35:07 +00:00
Abodunrinwa Toki
f44588afb1 Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
am: 16da1f545c

Change-Id: Ie527776ced88acf1139ac200b3a855bcd9beb76c
2017-08-30 22:52:23 +00:00
TreeHugger Robot
16da1f545c Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev 2017-08-30 22:13:58 +00:00
Kang Li
0935f152c7 Fixes NPE thrown in sort if new targets are added.
Test: manually tested it to verify that it works as expected.

Bug: 65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55
2017-08-30 21:32:08 +00:00
Nate Fischer
fbebfa9d53 WebView: fix setSafeBrowsingWhitelist table in docs
No change to logic, only docs changes.

The documentation for setSafeBrowsingWhitelist uses a table to describe
whitelist rules. However, this table was previously formatted
incorrectly (it uses <th> elements for each cell, when normal data cells
should use <td> according to Android API guidelines).

This fixes the table to conform to the guidelines, adjusts white space
for consistency, and removes an unnecessary <p> element.

Bug: 65173825
Test: make docs (and manually verify the table looks correct)
Change-Id: I5d7390a44613aaa3acb147a69f8e0ce741e817ed
2017-08-30 21:03:19 +00:00
Jeff Sharkey
8ab5f7f324 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
am: f31cf45e82

Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f
2017-08-30 19:14:21 +00:00
Jeff Sharkey
f31cf45e82 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev 2017-08-30 19:01:18 +00:00
Jim Miller
8ad2bd4b53 Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am: fb8e9b9096

Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212
2017-08-30 18:04:57 +00:00
TreeHugger Robot
fb8e9b9096 Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev 2017-08-30 17:47:46 +00:00
Jeff Sharkey
f4de294297 Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
2017-08-30 10:01:10 -06:00
Abodunrinwa Toki
692b196cc1 Introduce SmartSelectionEventTracker.
This will be used for logging text selection interaction.

Bug: 64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e
2017-08-30 13:38:51 +01:00
Christopher Tate
5296d3cc22 Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
am: a050d6302f

Change-Id: I6568f85ca95ab4e20f5f5195c7b7eb4982e8ec57
2017-08-30 00:05:36 +00:00
TreeHugger Robot
a050d6302f Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev 2017-08-29 23:47:50 +00:00
jackqdyulei
0e3504c0fa Add static lock in PowerProfile
Before this cl, there exists nullpointer crash in PowerProfile in
following part:

"sPowerMap.containsKey(key) && (Double) sPowerMap.get(key) > 0"

To my best knowledge, it is because in
PowerUsageSummary.SummaryProvider, we may create batterystats in
meantime:
1. setListening is invoked in worker thread, in which we will force
update the batterystats.
2. In setListening we will register receiver, which may update
batterystats through onReceive in UI thread.

This cl adds static lock in PowerProfile, making the init part can
only be accessed by an thread at a time.

Bug: 64209576
Test: Manual
Change-Id: I00bc094f44416669b4f0e11e647b0fae2ff61013
2017-08-29 15:30:42 -07:00
Evan Rosky
9a2bebcdc5 Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
am: 102520f88e

Change-Id: Ib6fd927e1d8af019ea2a644b95cd6dfc7ae8851d
2017-08-29 21:21:19 +00:00
TreeHugger Robot
102520f88e Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev 2017-08-29 21:01:05 +00:00
Jiongxuan Gao
4c04055489 Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
am: 10477217f5

Change-Id: Ifb68ab61a474a559586b6ad76a6b25cc6fd167d3
2017-08-29 20:18:27 +00:00
TreeHugger Robot
10477217f5 Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev 2017-08-29 20:09:56 +00:00
Hyunyoung Song
b93fe49a9e Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602" into oc-mr1-dev
am: cc4f60fe4b

Change-Id: Id657cc6bb5c5a63c408048c39908d24b2bc0cdb0
2017-08-29 20:01:25 +00:00
TreeHugger Robot
cc4f60fe4b Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602" into oc-mr1-dev 2017-08-29 19:54:26 +00:00
Vladislav Kaznacheev
8e8b215272 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am: 6a1dad9194

Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba
2017-08-29 19:21:09 +00:00
TreeHugger Robot
6a1dad9194 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev 2017-08-29 19:08:30 +00:00
Sudheer Shanka
4411d84551 Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
am: 903dc2fdd2

Change-Id: I2810e61300d5c2317639b261898931e66d075cb5
2017-08-29 18:01:14 +00:00
Sudheer Shanka
903dc2fdd2 Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev 2017-08-29 17:40:33 +00:00
Jiongxuan Gao
3365b16821 Fix ListView can not be moved after rotation.
Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.

Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.

Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.

Bug: 34365764

Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754
2017-08-29 10:26:39 -07:00
Jakub Pawlowski
f507490404 Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.

Bug: 64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Merged-In: I22ae624a0c51110cb69679f796926e3b2b36d0ac
(cherry picked from commit ee02e1ce77)
2017-08-29 17:26:23 +00:00
Jakub Pawlowski
2a43dcbc10 Merge "Fix GATT client leakage when scan is throttled (1/2)" am: 3cc1ad87f0 am: d019cce887
am: ced5e47a3d

Change-Id: Ie1316a273325cd5308cf9faab61dd0f43f899365
2017-08-29 08:31:19 +00:00
Jakub Pawlowski
ced5e47a3d Merge "Fix GATT client leakage when scan is throttled (1/2)" am: 3cc1ad87f0
am: d019cce887

Change-Id: I24d4dbf1344b13c558aa6974dfee6fd0e8549056
2017-08-29 08:19:50 +00:00
Jakub Pawlowski
d019cce887 Merge "Fix GATT client leakage when scan is throttled (1/2)"
am: 3cc1ad87f0

Change-Id: Ieda555f6f8bda35201327c6c6e0c97621b88671e
2017-08-29 08:09:15 +00:00
Jakub Pawlowski
3cc1ad87f0 Merge "Fix GATT client leakage when scan is throttled (1/2)" 2017-08-29 08:00:55 +00:00
Sudheer Shanka
6b1396e8fe KernelUidCpuFreqTimeReader: Put logs under debug flag.
Bug: 63041570
Test: N/A
Change-Id: Ifdeacb227bb936de82af9c9505621b327de3a9d2
2017-08-28 23:06:38 -07:00
Felipe Leme
1f9f8597e9 Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
am: 55309e79cf

Change-Id: I77d7a6e10d33b5e983d7652613c752829a886b01
2017-08-29 03:24:00 +00:00
TreeHugger Robot
55309e79cf Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev 2017-08-29 03:13:57 +00:00
Svetoslav Ganov
6da0a2b8a6 Merge "Grant location to default launcher" into oc-mr1-dev
am: 25e5a3446e

Change-Id: I25f08bcfd2d0774800f975cde195bc01f23734a9
2017-08-29 01:08:57 +00:00
Felipe Leme
c24a56ae06 Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.

That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.

Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes: 64309238
2017-08-28 18:04:15 -07:00
Svetoslav Ganov
25e5a3446e Merge "Grant location to default launcher" into oc-mr1-dev 2017-08-29 00:47:25 +00:00
Svet Ganov
5bb6bc6e52 Grant location to default launcher
Test: updated DefaultPermissionGrantPolicy test which passes

bug:62959599

Change-Id: Ifaac04758348049dd170a7e7b7ac234dced5f759
2017-08-28 15:12:05 -07:00
Christopher Tate
11620edf31 Note cross-user permission requirement for relevant wallpaper operations
Documentary change only.

Bug: 62343054
Test: N/A
Change-Id: Ibf6617b2c25306852478089b60a019479f8d2bcd
2017-08-28 14:19:32 -07:00
xulicheng
4755a1a41a Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48
am: 848cde3beb

Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2
2017-08-28 20:21:45 +00:00
xulicheng
848cde3beb Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81
am: 489f2c2c48

Change-Id: Idab1a2d1f4ee8cc28a38c3c82ea9a8ad7f9d3bf4
2017-08-28 20:11:08 +00:00
xulicheng
489f2c2c48 Merge "Ensure the generation is not changed before put value to cache"
am: 11ae580f81

Change-Id: I5bf2c557f6f46f1455204761a9045b8b90d7ea32
2017-08-28 19:58:06 +00:00
Nate Fischer
a97e0833d3 Merge "WebView: require APKs to target OMR1" into oc-mr1-dev
am: c233f44a26

Change-Id: I54f07a5f3672af8fa953b0861bcf2be4b90d0ac6
2017-08-28 19:49:26 +00:00
Nate Fischer
c233f44a26 Merge "WebView: require APKs to target OMR1" into oc-mr1-dev 2017-08-28 19:36:29 +00:00
Hyunyoung Song
dadb9e1728 Add shadow to adaptive icons to the shared sheet
Test: manual
Bug: 65015602

Change-Id: I01de79edc0a13817680106b1ef46e3212487b62f
2017-08-28 12:22:42 -07:00
Nate Fischer
220d86d142 WebView: require APKs to target OMR1
This disallows WebView/Monochrome APKs targeting O or below to be chosen
as WebView providers.

Bug: 65080651
Test: Open WebView shell with webview from system image, no crash
Test: Install Monochrome compiled for O, it's not in the webview provider list
Change-Id: I79162cedaa801ce227ad4c2eb3cbea9c08704da8
2017-08-28 12:15:56 -07:00