OSDN Git Service
Kun Niu [Mon, 7 Oct 2019 20:22:55 +0000 (13:22 -0700)]
Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev
am:
01dfc10948
Change-Id: I0c7f975dfd910d7c8773bbf3a46086bbca82c7a4
TreeHugger Robot [Mon, 7 Oct 2019 20:14:31 +0000 (20:14 +0000)]
Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev
Kevin Hufnagle [Mon, 7 Oct 2019 19:53:36 +0000 (12:53 -0700)]
Merge "docs: Edited sharedUserId deprecation message" into qt-dev
am:
35b69e2ca3
Change-Id: I5f1fbce04b8e7f70d623e15dce2c13d122cba95c
Kevin Hufnagle [Mon, 7 Oct 2019 19:35:38 +0000 (19:35 +0000)]
Merge "docs: Edited sharedUserId deprecation message" into qt-dev
Alan Stokes [Mon, 7 Oct 2019 15:18:41 +0000 (08:18 -0700)]
Merge "Revert new app installed notification doc" into qt-dev
am:
98540e2a16
Change-Id: I12b1bf9c6c078ee1629e2135140ccd59b8f9da81
Alan Stokes [Mon, 7 Oct 2019 14:41:57 +0000 (14:41 +0000)]
Merge "Revert new app installed notification doc" into qt-dev
Bill Yi [Sun, 6 Oct 2019 00:17:00 +0000 (17:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae1b021de5e543f5b157cde38e1f693a104f1fbe
Auto-generated-cl: translation import
Kevin Hufnagle [Fri, 4 Oct 2019 19:49:00 +0000 (19:49 +0000)]
docs: Edited sharedUserId deprecation message
Test: make ds-docs -j32
Bug:
142139123
Change-Id: I3485785126f268c76f81f760fc19e0506929b272
Philip P. Moltmann [Fri, 4 Oct 2019 18:43:06 +0000 (11:43 -0700)]
Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev
am:
0a71df1f7e
Change-Id: I658626de14fa325e08db3aead53707d8d3e00d3b
Philip P. Moltmann [Fri, 4 Oct 2019 18:23:30 +0000 (18:23 +0000)]
Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev
Bryan Ferris [Fri, 4 Oct 2019 17:57:23 +0000 (10:57 -0700)]
Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev
am:
06684aed55
Change-Id: I166f54becf2d4fa99939c1d9b5e9c335f70e8a69
Bryan Ferris [Fri, 4 Oct 2019 17:42:36 +0000 (17:42 +0000)]
Merge "Only allow INSTALL_ALLOW_TEST from shell or root" into qt-dev
Ricky Wai [Fri, 4 Oct 2019 15:10:17 +0000 (16:10 +0100)]
Revert new app installed notification doc
Bug:
111214100
Test: Able to compile
Change-Id: Id4fdabf0e8c69074eb8cb5838ab11d9d5f030093
Kun Niu [Tue, 2 Jul 2019 00:59:25 +0000 (17:59 -0700)]
add java_api_finder plugin to mainline module Media to generate java APIs used by Media.
Bug:
129294170
Test: m updatable-media RUN_ERROR_PRONE=true |& tee media_error_prone.out
Change-Id: I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24
(cherry picked from commit
6eff1d439b472b6114bc11f3a50c70ca7c68add7)
Merged-In: I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24
Svet Ganov [Tue, 24 Sep 2019 04:32:08 +0000 (21:32 -0700)]
Update PermissionChecker usages to avoid unnecessary attribution.
We had accidental usages of the PermissionChecker for cases where no
private data was provided to the app but the checkPermission API on
the latter also did blame data access on the app. The PermissionChecker
was designed to handle IPC calls and not for generic API checks.
To avoid future accidental incorrect PermissionChecker usages this
change renames the existing APIs of the latter to clearly indicate
that they should be used for data delivery and also adds sibling
methods for doing the same permission checks for preflight purposes.
Also the documentation is improved to furhter assist developers.
In addition, this change fixes accidental permission checker usages
that blame when they should not by using the new preflight flavor
of the permission check APIs.
Test:
atest com.android.settingslib.location.RecentLocationAppsTest
atest CtsPermissionTestCases
added: LocationAccessCheckTest#notificationOnlyForAccessesSinceFeatureWasEnabled
added: LocationAccessCheckTest#noNotificationIfFeatureDisabled
added: LocationAccessCheckTest#noNotificationIfBlamerNotSystemOrLocationProvider
added: LocationAccessCheckTest#testOpeningLocationSettingsDoesNotTriggerAccess
bug:
141028068
Merged-In: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
Change-Id: I65c71569d0dd8a40bc6fecabb22c5373dd6e806e
Seigo Nonaka [Wed, 2 Oct 2019 17:38:35 +0000 (10:38 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405 am:
b51c7bb175 am:
af62f3a7b3 -s ours am:
86ddd9eb6a -s ours
am:
eab868fa63
Change-Id: I2f88eecd916f2642cc3cb0c8ba91ed6348247900
Seigo Nonaka [Wed, 2 Oct 2019 17:30:08 +0000 (10:30 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405 am:
b51c7bb175 am:
af62f3a7b3 -s ours
am:
86ddd9eb6a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie6db3a3499cb02ef1bd34232a4ca8fb362b18e7d
Seigo Nonaka [Wed, 2 Oct 2019 17:10:34 +0000 (10:10 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405 am:
b51c7bb175
am:
af62f3a7b3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifb67887f4b1a5860dca2569e57a74911efde801d
Sterling Huber [Wed, 2 Oct 2019 16:59:45 +0000 (09:59 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev am:
e352c1f2bc -s ours
am:
66e93df90a
Change-Id: I1c8d52d8db52e53f15095d43e9744ece11f9c900
Seigo Nonaka [Wed, 2 Oct 2019 16:59:45 +0000 (09:59 -0700)]
RESTRICT AUTOMERGE Do not compute outside given range in TextLine am:
4ce901e405
am:
b51c7bb175
Change-Id: I6770f4b1a884020c374a75f67eb762b2c2bfd538
Sterling Huber [Wed, 2 Oct 2019 16:33:57 +0000 (09:33 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev
am:
e352c1f2bc -s ours
am skip reason: subject contains skip directive
Change-Id: Id51032f27a8325444290483a9a30da49da8ac2e2
Seigo Nonaka [Wed, 2 Oct 2019 16:33:53 +0000 (09:33 -0700)]
RESTRICT AUTOMERGE Do not compute outside given range in TextLine
am:
4ce901e405
Change-Id: I739746d80a8dd29998a67c1d9aaa2d3f804ac57c
Sterling Huber [Wed, 2 Oct 2019 15:51:19 +0000 (15:51 +0000)]
Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev
Bill Yi [Tue, 1 Oct 2019 18:19:50 +0000 (11:19 -0700)]
Import translations. DO NOT MERGE
BUG:
138175268
Change-Id: I4e6ca4ed7c7ba4a39a15988100fad60dafd79c02
Auto-generated-cl: translation import
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
RESTRICT AUTOMERGE
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
RESTRICT AUTOMERGE
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
Jungshik Shin [Mon, 30 Sep 2019 17:27:18 +0000 (10:27 -0700)]
Merge "Use NotoSansMyanmar (pure Unicode) fonts" into qt-dev
am:
e31854028e
Change-Id: I5337ac53b41fc00b87e6c74604900764d28359fa
TreeHugger Robot [Mon, 30 Sep 2019 17:09:15 +0000 (17:09 +0000)]
Merge "Use NotoSansMyanmar (pure Unicode) fonts" into qt-dev
Kevin Hufnagle [Mon, 30 Sep 2019 16:23:00 +0000 (09:23 -0700)]
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev
am:
667b944522
Change-Id: Ic5039fb781c73c2e1691c4c32afc7e35a9713683
Kevin Hufnagle [Mon, 30 Sep 2019 16:10:39 +0000 (16:10 +0000)]
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev
Bernardo Rufino [Mon, 30 Sep 2019 11:12:52 +0000 (04:12 -0700)]
Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev
am:
0a252361dd
Change-Id: I077cf0c3e82ddcec213b50b5efdba97699a7ed0d
Anna Malova [Mon, 30 Sep 2019 11:08:44 +0000 (04:08 -0700)]
Merge "[WebView] Minor javadoc fix for WebSettings." into qt-dev
am:
63c65616ae
Change-Id: I3ee0487212dfb139da111e9a7314dc781db66b63
Bernardo Rufino [Mon, 30 Sep 2019 11:00:13 +0000 (11:00 +0000)]
Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev
Anna Malova [Mon, 30 Sep 2019 10:54:16 +0000 (10:54 +0000)]
Merge "[WebView] Minor javadoc fix for WebSettings." into qt-dev
Suprabh Shukla [Sat, 28 Sep 2019 02:38:34 +0000 (19:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev am:
0e8f1fa5e9 -s ours
am:
c6a2982b86 -s ours
am skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1
873e19f63f is in history
Change-Id: I8c9e309eae92633cb6193f147f81d109cc812d7c
Suprabh Shukla [Sat, 28 Sep 2019 02:31:55 +0000 (19:31 -0700)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
am:
b036952896
Change-Id: Ieb5d9cc6e8aee976069c7ebd0b8d01db9982d886
Suprabh Shukla [Sat, 28 Sep 2019 02:31:51 +0000 (19:31 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
am:
873e19f63f
Change-Id: I2447a90e4935e53fc0d55510bb50938fdaea23fa
Suprabh Shukla [Sat, 28 Sep 2019 02:31:47 +0000 (19:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
am:
0e8f1fa5e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I53678027aa329651d6d6c9652aee847ee36b9b30
TreeHugger Robot [Sat, 28 Sep 2019 02:15:10 +0000 (02:15 +0000)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
TreeHugger Robot [Sat, 28 Sep 2019 02:08:05 +0000 (02:08 +0000)]
Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
Kevin Hufnagle [Fri, 27 Sep 2019 23:51:27 +0000 (23:51 +0000)]
docs: Added link to multi-window drag how-to guide
Test: make ds-docs -j32
Bug:
71008103
Change-Id: Ifcc50920cf3828697add018d1d3a6a827c7c9f98
Anna Malova [Wed, 25 Sep 2019 11:19:27 +0000 (12:19 +0100)]
[WebView] Minor javadoc fix for WebSettings.
No change to logic.
Test: N/A
Bug:
132394762
Change-Id: I957b0d8a03cd937b38611e32f6c012b01a6ad7da
Evan Laird [Tue, 24 Sep 2019 23:14:05 +0000 (19:14 -0400)]
DO NOT MERGE Allow for HTML styling in mobile data type content descriptions
This CL implements a (somewhat hacky) way to enable HTML attributes in
the mobile data type content description strings. This way we can use
some basic styling in the Quick Settings cellular data tile which uses
it in a TextView.
We do this by assuming that the content description is valid, escaped
HTML, and send two separate CharSequences to all of the listeners, all
of which can then decide if they need the regular content description or
the prettified version.
Test: atest SystemUITests; system ui demo mode
Bug:
141177147
Change-Id: Idf387111b0cdc34ad3762eac0ec6c2b484b393e3
Merged-In: Idf387111b0cdc34ad3762eac0ec6c2b484b393e3
Kevin Hufnagle [Tue, 24 Sep 2019 22:06:18 +0000 (15:06 -0700)]
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev
am:
e49cbb3a5d
Change-Id: I24a281dd7194ea5c731ecc02371734fe1fa315f8
Todd Kennedy [Fri, 20 Sep 2019 20:45:15 +0000 (13:45 -0700)]
Only allow INSTALL_ALLOW_TEST from shell or root
Bug:
141169173
Test: Manual. App can't be installed as test-only
Change-Id: Ib6dcca7901aa549d620448c0165c22270a3042be
Kevin Hufnagle [Tue, 24 Sep 2019 21:18:39 +0000 (21:18 +0000)]
Merge "docs: Modernized AccessibilityNodeProvider example" into qt-dev
Kevin Hufnagle [Mon, 23 Sep 2019 23:08:03 +0000 (16:08 -0700)]
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev
am:
2a082b1e9e
Change-Id: I74d42b68ebed97c2db3a179e92ba3196ffc7a04f
Kevin Hufnagle [Mon, 23 Sep 2019 22:45:45 +0000 (22:45 +0000)]
Merge "docs: List BIOMETRIC_WEAK in setPasswordQuality()" into qt-dev
Kevin Hufnagle [Fri, 20 Sep 2019 22:39:50 +0000 (15:39 -0700)]
Merge "docs: Fixed link to material design for ScrollView" into qt-dev
am:
80b543b45a
Change-Id: Ic7cc4494a88e6feaedf85626270ed1e8057189f5
Kevin Hufnagle [Fri, 20 Sep 2019 22:14:46 +0000 (22:14 +0000)]
Merge "docs: Fixed link to material design for ScrollView" into qt-dev
Kevin Hufnagle [Wed, 18 Sep 2019 01:52:45 +0000 (01:52 +0000)]
docs: Fixed link to material design for ScrollView
Test: make ds-docs -j32
Bug:
141024886
Change-Id: I69d05cdf99d91f74143454c78c000128d1da42ce
Santos Cordon [Thu, 19 Sep 2019 15:08:30 +0000 (08:08 -0700)]
Merge "Acquire display suspend blocker for DozeService" into qt-dev
am:
576a6f4ac5
Change-Id: I75471698513cfc72c87f0149d4da891d7156fa3b
TreeHugger Robot [Thu, 19 Sep 2019 14:50:10 +0000 (14:50 +0000)]
Merge "Acquire display suspend blocker for DozeService" into qt-dev
Bernardo Rufino [Thu, 29 Aug 2019 18:12:28 +0000 (19:12 +0100)]
Don't consider tasks with INITIALIZING top activity as visible
To fix b/
130645908, tasks with top activities in INITIALIZING state were
considered visible. This allowed apps to circumvent background activity
launch restriction by starting 2 activities when in a background stack.
The first activity will remain in INITIALIZING state (since it's in the
bg), so the second launch is permitted since top activity is
INITIALIZING.
Removing '|| topActivity.isState(INITIALIZING)' removes the
vulnerability and curiously still allow the legitimate use case of the
bug linked above to work, i.e. the test in ag/
7088262 still passes. This
is because of 2 reasons:
1) Grace period introduced in ag/
7638265.
2) Allow bg activity starts to put activity on top of bg task (instead of
fg’ing it) in ag/
7190176.
I verified (2) by removing the grace period check, reverting the linked
CL and verifying that the test failed.
This essentially reverts ag/
7090415.
Test: atest BackgroundActivityLaunchTest \
RootWindowContainerTests \
WmTests:ActivityStarterTests \
CtsWindowManagerDeviceTestCases:ActivityStarterTests
Bug:
138583650
Bug:
130645908
Change-Id: Iee4ba841c6c83888b55c5cb55fffc949048d2030
Kevin Hufnagle [Thu, 19 Sep 2019 00:32:55 +0000 (17:32 -0700)]
Merge "docs: Add condition for hiding synth. activities" into qt-dev
am:
00537efd07
Change-Id: I1ec3fb8fea7f6b5fe292807b3951fb265a9cbb94
Kevin Hufnagle [Thu, 19 Sep 2019 00:20:47 +0000 (00:20 +0000)]
Merge "docs: Add condition for hiding synth. activities" into qt-dev
Seigo Nonaka [Wed, 18 Sep 2019 20:17:17 +0000 (13:17 -0700)]
Merge "Do not compute outside given range in TextLine" into qt-dev
am:
01082fe6ae
Change-Id: I9d88c47a16747009fda893660fd36d325d212a40
TreeHugger Robot [Wed, 18 Sep 2019 20:05:29 +0000 (20:05 +0000)]
Merge "Do not compute outside given range in TextLine" into qt-dev
Kevin Hufnagle [Tue, 17 Sep 2019 19:19:12 +0000 (12:19 -0700)]
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
am:
1fe99017eb
Change-Id: I13ba0297750b5b375f4874640b14b4955d17eeaa
Kevin Hufnagle [Tue, 17 Sep 2019 18:54:20 +0000 (18:54 +0000)]
Merge "docs: Fixed contradictory info in IntentFilter" into qt-dev
Kevin Hufnagle [Fri, 13 Sep 2019 02:18:44 +0000 (02:18 +0000)]
docs: Add condition for hiding synth. activities
If an app doesn't have a launcher activity enabled by default, a
synthesized activity isn't created for that app.
Test: make ds-docs -j32
Bug:
140968734
Change-Id: I2fe8666ee8cde479f404e43c622f03891d96c38f
Suprabh Shukla [Mon, 16 Sep 2019 20:20:22 +0000 (13:20 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
Revoking an apps authorizations to use camera and record or play audio
while suspended. Appops watchers will also be notified of this change to
re-evaluate privileges at the time of suspension.
Test: atest FrameworksServicesTests:SuspendPackagesTest
atest GtsSuspendAppsTestCases
Bug:
138636979
Change-Id: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ic5fb1807deceabfd956b666fa76f8bcc94020ac3
Suprabh Shukla [Fri, 13 Sep 2019 00:35:22 +0000 (17:35 -0700)]
DO NOT MERGE revoke certain app-ops on suspend
Revoking an apps authorizations to use camera and record or play audio
while suspended. Appops watchers will also be notified of this change to
re-evaluate privileges at the time of suspension.
Test: atest FrameworksServicesTests:SuspendPackagesTest
Bug:
138636979
Change-Id: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ie95555856afdd56728125f7e60b6a78cf9fc0e58
Merged-In: Ic5fb1807deceabfd956b666fa76f8bcc94020ac3
Seigo Nonaka [Mon, 16 Sep 2019 21:49:49 +0000 (14:49 -0700)]
Do not compute outside given range in TextLine
This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.
Bug:
140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
Kevin Hufnagle [Sat, 24 Aug 2019 01:04:09 +0000 (01:04 +0000)]
docs: Modernized AccessibilityNodeProvider example
Uses a delegate and more realistic method contents. Also added
language switcher for Kotlin-based and Java-based code.
Test: make ds-docs -j32
Bug:
138849874
Change-Id: Id31cf944f4adab2f09cf5004d68434b445da6eeb
Santos Cordon [Thu, 1 Aug 2019 17:33:20 +0000 (18:33 +0100)]
Acquire display suspend blocker for DozeService
If DozeService explicitly requests the display state to be on,
then PowerManager needs to acquire the display suspend blocker even
while in DOZE mode to prevent the system from constantly trying
to suspend.
Bug:
138195405
Test: atest PowerManagerServiceTest
Change-Id: I05f5b86789ced084d0814480b2fe89d74f96a54e
(cherry picked from commit
d9701abf0482d644551657124a315ee1e6638e85)
Jungshik Shin [Mon, 16 Sep 2019 05:57:31 +0000 (22:57 -0700)]
Use NotoSansMyanmar (pure Unicode) fonts
Revert Myanmar fonts to those on Android P.
Instead NotoSansMyanmar*-ZawDecode (Unicode-Zawgyi hybrid) fonts,
go back to NotoSansMyanmar and NotoSansMyanmarUI (pure Unicode) fonts.
Bug:
141019225
Change-Id: Ib2494b9b5cb148f598e69271c5676e7104f66ae3
Adam Seaton [Sat, 14 Sep 2019 12:28:23 +0000 (05:28 -0700)]
Merge "Revert "don't compute outside of visible range"" into qt-dev
am:
e4d9618d67
Change-Id: I45acc1f2174f7faddfcd3e2f025e412afb8625d0
TreeHugger Robot [Sat, 14 Sep 2019 12:10:43 +0000 (12:10 +0000)]
Merge "Revert "don't compute outside of visible range"" into qt-dev
Adam Seaton [Fri, 13 Sep 2019 22:08:30 +0000 (22:08 +0000)]
Revert "don't compute outside of visible range"
bug:
141016653
This reverts commit
0a57fe099a55ab3a7583b229fa7cfb905d6106f3.
Reason for revert: CL is implicated in https://b.corp.google.com/issues/
141016653
Change-Id: I39954226cb8971ee17e367692b3fd0e29871ad48
TreeHugger Robot [Fri, 13 Sep 2019 05:26:35 +0000 (05:26 +0000)]
Merge changes from topic "cherry-pick-dropped-sensor" into qt-r1-dev
* changes:
Fix issue where notif wouldn't HUN
Assume sensors perform prox check
Lucas Dupin [Mon, 9 Sep 2019 21:06:55 +0000 (14:06 -0700)]
Fix issue where notif wouldn't HUN
DozeSensors and DozeTriggers have code that perform proximity
checks in slightly different ways. DozeSensors was updated as
part of ag/
9185335 bug DozeTriggers wasn't.
Bug:
9185335
Fixes:
140701062
Bug:
138765669
Test: partially cover prox, send notification, look at screen
Change-Id: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f
Merged-In: Ic85181abb3edd4c77c427faefa4cd6b9c35b498f
Lucas Dupin [Wed, 7 Aug 2019 22:55:00 +0000 (15:55 -0700)]
Assume sensors perform prox check
Assume that doze sensors will be prox gated.
Not doing so would be a bad idea anyway since the device would wake
up way more often than it should and drain battery.
Another improvement on this CL is that regular DozeSensors prox
checks are trying to use a binned brightness sensor instead.
Fixes:
138765669
Test: atest DozeSensorsTest DozeTriggersTest
Test: single tap from AOD (observe no re-registration of lift)
Test: 'reach' from AOD (observe no re-registration of lift)
Test: receive notification with prox covered or unobstructed
Change-Id: I1961ff9b16480ba1a60c397570494dd7acb4802d
(cherry picked from commit
f40bd8fbb65c896c824fe3f1a5be857bbe8ae281)
Merged-In: I1961ff9b16480ba1a60c397570494dd7acb4802d
Jeff Sharkey [Thu, 12 Sep 2019 20:32:28 +0000 (13:32 -0700)]
Merge changes from topic "bp-
135269143-p" into pi-dev am:
604d91d713
am:
bf25aeaa84
Change-Id: Iedf8e18ed3c3c555d40534d6a00a47faff376c63
Jeff Sharkey [Thu, 12 Sep 2019 20:32:18 +0000 (13:32 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
216bbc2a2e -s ours
am:
06cf16b862
Change-Id: Iba3e9f517e08cce3c6453ba3d0f6152552c23dbf
Jeff Sharkey [Thu, 12 Sep 2019 20:24:04 +0000 (13:24 -0700)]
Merge changes from topic "bp-
135269143-p" into pi-dev
am:
604d91d713
Change-Id: I4732eced6b91fd0f7a3e83197f4fcbf63b9c977d
Jeff Sharkey [Thu, 12 Sep 2019 20:23:56 +0000 (13:23 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
216bbc2a2e -s ours
am skip reason: subject contains skip directive
Change-Id: I34ab810a0ce6c747236b6e0660b0f69b8e12d4a1
Jeff Sharkey [Thu, 12 Sep 2019 19:59:29 +0000 (19:59 +0000)]
Merge changes from topic "bp-
135269143-p" into pi-dev
* changes:
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103
Bug:
135269143
Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest
Test: atest FrameworksCoreTests:android.database.sqlite.SQLiteTokenizerTest
Exempt-From-Owner-Approval: already approved in downstream branch
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25
Jeff Sharkey [Thu, 12 Sep 2019 18:02:54 +0000 (11:02 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f am:
8acb456949 -s ours am:
fd58ea607e -s ours
am:
0b712aaf6e
Change-Id: I6456bb9766d9c14fcd5beb3c69b24ced02605ed8
Jeff Sharkey [Thu, 12 Sep 2019 18:02:46 +0000 (11:02 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0 am:
e89348b54b -s ours am:
01787e9e4d -s ours
am:
fde3c88071
Change-Id: Icdc48f2731ec5e5097595f5a0cc3917aa2583540
Jeff Sharkey [Thu, 12 Sep 2019 17:59:26 +0000 (10:59 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518 am:
c97dfb57a8 -s ours am:
40a236db41 -s ours
am:
b3c4ddb61e
Change-Id: I4fbf580a4e5d17c8ceb7fcd9176a048f9accfc19
Jeff Sharkey [Thu, 12 Sep 2019 17:59:01 +0000 (10:59 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257 am:
bba6744ff4 -s ours am:
2ccbb35723 -s ours
am:
79c2faf372
Change-Id: Ic3f1646d160f539faae4507c736dd3f5ce394616
Jeff Sharkey [Thu, 12 Sep 2019 17:49:27 +0000 (10:49 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f am:
8acb456949 -s ours
am:
fd58ea607e -s ours
am skip reason: subject contains skip directive
Change-Id: I046483ec092ef5b4bbc9f736184d328f954974c7
Jeff Sharkey [Thu, 12 Sep 2019 17:49:22 +0000 (10:49 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0 am:
e89348b54b -s ours
am:
01787e9e4d -s ours
am skip reason: subject contains skip directive
Change-Id: I412ec10b29cb494e473bbfe8f50385676f50a00c
Jeff Sharkey [Thu, 12 Sep 2019 17:41:38 +0000 (10:41 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518 am:
c97dfb57a8 -s ours
am:
40a236db41 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia508b84e09af199cd841d37c89a41c722d63a101
Jeff Sharkey [Thu, 12 Sep 2019 17:41:24 +0000 (10:41 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257 am:
bba6744ff4 -s ours
am:
2ccbb35723 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib655f9d604bfecbd6be64b1e4cfe9996a58fcbaa
Jeff Sharkey [Thu, 12 Sep 2019 17:31:54 +0000 (10:31 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f
am:
8acb456949 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9934307cef63a331bb1fad3ba4fddee11393d98
Jeff Sharkey [Thu, 12 Sep 2019 17:31:49 +0000 (10:31 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0
am:
e89348b54b -s ours
am skip reason: subject contains skip directive
Change-Id: I80528a71e90049489b85b5c95baf93cbd3a17808
Jeff Sharkey [Thu, 12 Sep 2019 17:27:55 +0000 (10:27 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518
am:
c97dfb57a8 -s ours
am skip reason: subject contains skip directive
Change-Id: I6467326680d2164bb4e2a9e54dc22cc490e2492d
Jeff Sharkey [Thu, 12 Sep 2019 17:27:37 +0000 (10:27 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257
am:
bba6744ff4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8711dac1ad4d2512d64dc489d87ffd4a18c0ebd6
Jeff Sharkey [Thu, 12 Sep 2019 17:18:26 +0000 (10:18 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4
am:
f6aa7b8d8f
Change-Id: I466630af8385d6da164196f2420d040b2aa6e2ac
Jeff Sharkey [Thu, 12 Sep 2019 17:18:22 +0000 (10:18 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5
am:
fc095efde0
Change-Id: I9bbeb106c1abe977439420d8005f33f5a7c1eaa1
Jeff Sharkey [Thu, 12 Sep 2019 17:14:15 +0000 (10:14 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab
am:
b0054f0518
Change-Id: I491c415de567d0375296f293fcbb35ee21413ce6
Jeff Sharkey [Thu, 12 Sep 2019 17:14:00 +0000 (10:14 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c
am:
37e2229257
Change-Id: I3d7696be9733e40f31c160a77505c4e96ca05b5e
Jeff Sharkey [Thu, 12 Sep 2019 17:06:14 +0000 (10:06 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
am:
f8a2d069b4
Change-Id: If9534450fac2cd9b328f105be73f53c92ab14dbd
Jeff Sharkey [Thu, 12 Sep 2019 17:06:09 +0000 (10:06 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
am:
f683c688d5
Change-Id: I64ae89ecc92127de21503fbcfdd34c60a6f620bc
Jeff Sharkey [Thu, 12 Sep 2019 17:02:13 +0000 (10:02 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
am:
7633a081ab
Change-Id: Ia3853da8933c8c21fe06acad79059a3589eeb835
Jeff Sharkey [Thu, 12 Sep 2019 17:02:05 +0000 (10:02 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
92e5e5e45c
Change-Id: I2e0a5c5cd35f9abcf362d3db4514e1bbd6bd7035
Jeff Sharkey [Thu, 12 Sep 2019 16:33:21 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev