Commit Graph

72482 Commits

Author SHA1 Message Date
Andrei Stingaceanu
9a06d4bc77 Merge "Fix unexpected DatePicker validation" into oc-dev
am: cd603221e1

Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
2017-06-08 14:44:20 +00:00
TreeHugger Robot
cd603221e1 Merge "Fix unexpected DatePicker validation" into oc-dev 2017-06-08 14:36:13 +00:00
Felipe Leme
4d579eacec Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918

Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
2017-06-08 06:07:15 +00:00
Adam Bookatz
0fcadeaeb9 Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am: 6029bce3b4

Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
2017-06-08 05:59:56 +00:00
Todd Kennedy
de066fd249 Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978

Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
2017-06-08 05:50:03 +00:00
Felipe Leme
9be8c96918 Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev 2017-06-08 05:21:08 +00:00
Kevin Chyn
4fddc9fa4d Add setting and permission for assist gesture
Bug: 37427306

Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
2017-06-07 21:42:55 -07:00
Adam Bookatz
6029bce3b4 Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev 2017-06-08 02:43:20 +00:00
TreeHugger Robot
dacdf2e978 Merge "Passing callingUid to internal methods" into oc-dev 2017-06-08 01:00:52 +00:00
Bryce Lee
50caf4af60 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am: f867733d4f

Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
2017-06-07 23:31:48 +00:00
Sundeep Ghuman
216f596cee Merge "Remove Wifi Badges from platform." into oc-dev
am: 09d06437ad

Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
2017-06-07 23:25:50 +00:00
Bryce Lee
f867733d4f Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev 2017-06-07 23:23:30 +00:00
TreeHugger Robot
09d06437ad Merge "Remove Wifi Badges from platform." into oc-dev 2017-06-07 23:19:09 +00:00
Bryce Lee
46b01655b3 Revert "Coordinate configuration changes and window frame size."
This reverts commit afb45bba83.

Bug: 32839232
Fixes: 62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
2017-06-07 23:03:09 +00:00
Todd Kennedy
18211fd8f6 Passing callingUid to internal methods
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.

Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes: 38349978
2017-06-07 15:53:21 -07:00
Bookatz
6d79993cb3 Avoid background getTotalTimeLocked misreporting
It has been discovered that for background values of
AggregatedWakelock, Sync, Job, and partial wakelocks,
the value of getTotalTimeLocked is wrong and often very
negative. getTotalDurationMsLocked, which should provide the exact same
value in all of these cases (since background data is never pooled),
does not have this problem. So while the source of the bug is sought
out, we should use getTotalDurationMsLocked instead of getTotalTimeLocked for
these data.

Bug: 62352334
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I78e84368615578483ab8e9e5f0ee1d067491be08
2017-06-07 13:29:41 -07:00
Julia Reynolds
f9f6424adb Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
2017-06-07 20:21:26 +00:00
Julia Reynolds
6e96251d92 Merge "Revert "Change default for group alert behavior"" into oc-dev 2017-06-07 20:12:28 +00:00
Jeff Sharkey
dab10f2bb3 Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am: 6746aa8c4d

Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
2017-06-07 19:13:01 +00:00
Jeff Sharkey
6746aa8c4d Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev 2017-06-07 19:03:57 +00:00
Todd Kennedy
1581bb0b75 Merge "always adjust per-user application info" into oc-dev
am: 91a9d65e42

Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
2017-06-07 18:50:33 +00:00
Todd Kennedy
91a9d65e42 Merge "always adjust per-user application info" into oc-dev 2017-06-07 18:42:13 +00:00
Albert Chaulk
51d67cf693 Add a WM API to query the touch region for the input method window
This is needed by VR to handle keyboards that display a window larger
than the interactable region

Bug: 62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit 56162a0a51)
2017-06-07 16:29:02 +00:00
Julia Reynolds
2f431e264d Revert "Change default for group alert behavior"
This reverts commit 8f7828ebe7.

Mutes sound on legacy apps that use their summaries to make sound

Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d

Fixes: 62387153
2017-06-07 14:16:05 +00:00
Doris Liu
ba087b09fc Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp
am: 721ecfd21a

Change-Id: Iec199dd0cfe7beace7549d3e16e888458fd0306c
2017-06-07 03:58:45 +00:00
Doris Liu
a41b26481c Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am: 8d06d8cbf1

Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969
2017-06-07 03:49:44 +00:00
Doris Liu
8d06d8cbf1 Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev 2017-06-07 03:43:13 +00:00
Doris Liu
88bb31b954 Better handle non-recommended use and warn against it in JavaDoc
BUG: 62386748
Test: Follow repro steps in b/62358678. The issue is no
longer reproducible

Change-Id: Ic3cec7c4947296224edb5365d81988d4da7ee5e1
2017-06-07 01:41:34 +00:00
Evan Rosky
fd80d0e8ac Merge "Don't report focusableViewAvailable on add" into oc-dev am: 8d4b72c68a
am: 2b64c87366

Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689
2017-06-07 01:19:12 +00:00
Evan Rosky
2b64c87366 Merge "Don't report focusableViewAvailable on add" into oc-dev
am: 8d4b72c68a

Change-Id: I4169c2ecf3890946090e4c171a666292262118f6
2017-06-07 01:09:17 +00:00
Evan Rosky
8d4b72c68a Merge "Don't report focusableViewAvailable on add" into oc-dev 2017-06-07 01:02:21 +00:00
Felipe Leme
f9a9bbf430 Merge "Use initial value on save when value didn't change." into oc-dev am: 2e723982d5
am: 08365011a2

Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d
2017-06-07 00:57:16 +00:00
Felipe Leme
c14129043f Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am: 49231f183f
am: fc4604f719

Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
2017-06-07 00:48:54 +00:00
Felipe Leme
08365011a2 Merge "Use initial value on save when value didn't change." into oc-dev
am: 2e723982d5

Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
2017-06-07 00:46:53 +00:00
Sundeep Ghuman
19f64d084d Remove Wifi Badges from platform.
This change makes it impossible to return a badged wifi icon, even if
scoring ui is enabled. It also prevents IAE from net badgecurve enums.

Bug: b/35628911
Test: make -j40
Change-Id: I014f27e5c4e42075e7e62da7fffb9ecf38f6eb4c
2017-06-06 17:40:01 -07:00
Felipe Leme
fc4604f719 Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am: 49231f183f

Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
2017-06-07 00:38:40 +00:00
Felipe Leme
2e723982d5 Merge "Use initial value on save when value didn't change." into oc-dev 2017-06-07 00:25:11 +00:00
Felipe Leme
49231f183f Merge "Don't show AUTOFILL menu when text is selected." into oc-dev 2017-06-07 00:24:03 +00:00
Rob Carr
198aa2bcda Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev am: 3946916d56
am: 8296054d4e

Change-Id: Iaf35647355f48300199d888eb884a23750c0059b
2017-06-07 00:03:51 +00:00
Rob Carr
8296054d4e Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am: 3946916d56

Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
2017-06-06 23:52:56 +00:00
Daniel Sheng
18c44c5b08 Merge "Changed camera lift trigger to default-on." 2017-06-06 23:26:10 +00:00
Jeff Sharkey
2063e4f6ba Remove old FUSE bypass now that we have sdcardfs.
This forces everyone to go through sdcardfs, instead of letting them
around the back door.

Test: builds, boots
Bug: 38231314, 27992761
Change-Id: I97b24d25599c7f86f9b535689e2f4ecf68261dac
2017-06-06 16:03:26 -06:00
TreeHugger Robot
d131f19c50 Merge "Add new haptic feedback constant for virtual key release." 2017-06-06 21:35:51 +00:00
Felipe Leme
2f6fc72efc Overall improvement on Autofill javadocs for autofillable APIs.
Bug: 37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Change-Id: I7eaf0a521c3777baf0dc0002ae814990fd96a14c
2017-06-06 14:33:56 -07:00
Robert Carr
851e7e4394 SurfaceView: Correct inverted alpha detection condition.
Careless mistake on my part :). Sorry about that.

Test: Try an app with two SV like Netflix verify top SurfaceView doesn't occlude bottom one.
Bug: 62375611
Bug: 62113351
Change-Id: Ia33aabf8b8e276f70365d62b82f113ecd3bee2fa
2017-06-06 14:04:50 -07:00
Felipe Leme
e8f6808079 Use initial value on save when value didn't change.
Otherwise, it will fail to call onSaveRequest() in scenarios where the service
required a field that was pre-populated for the app. For example, when the
service requires both a username and password, the app pre-populates the
username, and the user fills the password.

Test: new LoginActivityTest.testSaveOnlyTwoRequiredFieldsOnePrefilled() pass
Test: existing CtsAutoFillServiceTestCases pass

Bug: 62270740

Change-Id: Idbb11a8c2dab6741c18549c55dfdb71b483c2447
2017-06-06 13:49:42 -07:00
Christopher Tate
e5ef67692e Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773
2017-06-06 20:43:28 +00:00
Christopher Tate
169a884f81 Merge "Fix #62350081 - annotate permission requirements" into oc-dev
am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
2017-06-06 20:32:55 +00:00
TreeHugger Robot
42abe82bbb Merge "Fix #62350081 - annotate permission requirements" into oc-dev 2017-06-06 20:18:21 +00:00
Jian Sun
2ca9937f79 Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev am: f1946baae7
am: c3c3112806

Change-Id: I82589c5cf90d8dbb02bab757d58e8584bd05bdb8
2017-06-06 19:00:17 +00:00