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
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
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
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
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
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
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
Jakub Pawlowski
ee02e1ce77
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
2017-08-28 18:09:03 +00:00
Winson Chung
6514dca8ee
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
...
am: 3ea1e3d57d
Change-Id: I82384a2fb55e4f66e627a9e70f729fb5a2bff8a1
2017-08-26 06:30:34 +00:00
TreeHugger Robot
3ea1e3d57d
Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev
2017-08-26 06:22:34 +00:00
Michael Wright
800af77f9c
Merge "O MR1 is API 27" into oc-mr1-dev
...
am: d489d122f4
Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
2017-08-26 02:41:46 +00:00
TreeHugger Robot
d489d122f4
Merge "O MR1 is API 27" into oc-mr1-dev
2017-08-26 02:29:51 +00:00
Felipe Leme
8c9167565b
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df am: da31220015
...
am: d29128d699
Change-Id: If8eae5bc9f2985c913179b2fc881d7bf03510276
2017-08-25 22:05:01 +00:00
Felipe Leme
d29128d699
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df
...
am: da31220015
Change-Id: I2a928f1e1c0e7fba03c1ebc8c61a182ecebb32c0
2017-08-25 21:55:40 +00:00
Felipe Leme
ca03b3fbe6
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df
...
am: da31220015
Change-Id: I1ccd7b54c27ce65edcf9b1aceba7097bd8fc32e2
2017-08-25 21:54:45 +00:00
Felipe Leme
da31220015
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
...
am: 7d29b6f2df
Change-Id: Ibfabc9d32aa0da80e636a27eebf1b50bdd9692b3
2017-08-25 21:36:04 +00:00
TreeHugger Robot
7d29b6f2df
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
2017-08-25 21:27:56 +00:00
Michael Wright
9d9693e4af
Merge "Add new system API for stable display size" into oc-mr1-dev
...
am: c217d744b4
Change-Id: I25a68c0bf9eecd1dbe878851a62926520d4ea71a
2017-08-25 21:02:36 +00:00
TreeHugger Robot
c217d744b4
Merge "Add new system API for stable display size" into oc-mr1-dev
2017-08-25 20:56:57 +00:00
Michael Wright
eedcbf1504
Add new system API for stable display size
...
Fixes: 34388294
Test: manual
Change-Id: Ie380230bbd82370f507161b4cdb6f0d100b09f11
2017-08-25 20:56:00 +00:00
Santos Cordon
49ef0ee289
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
...
am: 0405d12a31
Change-Id: I8a9c7b921489d12f8b9822d4d2b3b53d17368802
2017-08-25 20:18:50 +00:00
TreeHugger Robot
0405d12a31
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
2017-08-25 20:13:31 +00:00
Felipe Leme
8f71607fda
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e am: 948e9ff4d3
...
am: 017c0192d7
Change-Id: I581283831c31705ac2dbb344eb1e0bdc0d25e396
2017-08-25 19:56:01 +00:00
Felipe Leme
017c0192d7
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e
...
am: 948e9ff4d3
Change-Id: I322ab59aa9600b7deb5a48f2e6fc6e012053b8f3
2017-08-25 19:48:51 +00:00
Felipe Leme
6660644576
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e
...
am: 948e9ff4d3
Change-Id: I90a42739dfa01c49fdbf799c49e3d569abcedf11
2017-08-25 19:47:23 +00:00