Jeff Sharkey
ef0bac1d92
Merge "We can't be as clever as we'd like."
2019-12-19 20:14:43 +00:00
Nikita Dubrovsky
8cdd14c92e
Merge "Ability to start a cursor drag from anywhere in an editable TextView"
2019-12-19 19:34:51 +00:00
Automerger Merge Worker
88159cccc1
Merge "Delete VINTF compatibility checks during OTA." am: bdc465991f am: 8ca8a6d00d am: b4e26195e3
...
Change-Id: I9e2ffa25d77cb18dbd82515d6814064878f262c1
2019-12-19 19:34:15 +00:00
TreeHugger Robot
1e0398dc47
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
2019-12-19 19:17:11 +00:00
Automerger Merge Worker
b4e26195e3
Merge "Delete VINTF compatibility checks during OTA." am: bdc465991f am: 8ca8a6d00d
...
Change-Id: I9d0a3698b096ec66604403f405d73c4f112f689e
2019-12-19 19:16:28 +00:00
Yifan Hong
8ca8a6d00d
Merge "Delete VINTF compatibility checks during OTA."
...
am: bdc465991f
Change-Id: I96dc350718baa45682ac0abd5d877160232db07c
2019-12-19 11:02:07 -08:00
Yifan Hong
bdc465991f
Merge "Delete VINTF compatibility checks during OTA."
2019-12-19 18:56:13 +00:00
Joshua Imbriani
0ee8fe5c09
Merge "Updating documentation for synthesizeToText"
2019-12-19 18:52:21 +00:00
Automerger Merge Worker
7fabca1b35
Merge "Expose ModemActivitiyInfo to system API" am: 5910f6dd65 am: 340397814a
...
Change-Id: I5ec18c82caa066e2aced3432756cd0811ff4a9cb
2019-12-19 18:42:52 +00:00
Joshua Mccloskey
0cf243eafd
Merge "Add builder method to check DevicePolicyManager"
2019-12-19 18:21:44 +00:00
Chen Xu
340397814a
Merge "Expose ModemActivitiyInfo to system API"
...
am: 5910f6dd65
Change-Id: Iaec1dc20a01c5a061d3835a8a82f6d2c205aa004
2019-12-19 10:08:19 -08:00
Chen Xu
5910f6dd65
Merge "Expose ModemActivitiyInfo to system API"
2019-12-19 18:01:46 +00:00
Suren Baghdasaryan
6c9b1f8f85
Merge "Add JNI API to query sizes of ION heaps, pools and mapped part of the heaps"
2019-12-19 17:09:18 +00:00
TreeHugger Robot
c5c9e5c25a
Merge "Add SurfaceControl.Transaction lock debugging utility."
2019-12-19 17:06:17 +00:00
Artur Satayev
c20b82a466
Merge "Use new UnsupportedAppUsage annotation."
2019-12-19 16:55:30 +00:00
TreeHugger Robot
29ac92a2e8
Merge "Controls API - Adding service impl"
2019-12-19 16:53:14 +00:00
Nikita Dubrovsky
9a1369b4ad
Ability to start a cursor drag from anywhere in an editable TextView
...
Bug: 143852764, 145535274
Test: Manual testing and unit tests
atest FrameworksCoreTests:EditorTouchStateTest
atest FrameworksCoreTests:EditorCursorDragTest
Change-Id: I6de3da98bd1e9e37a7d81e343514cb1e7ab6816a
2019-12-19 08:26:23 -08:00
Suren Baghdasaryan
5bf4706ed1
Add JNI API to query sizes of ION heaps, pools and mapped part of the heaps
...
Provide means for system_server to query ION memory usage. The new API
allows to get total size of ION heaps, pools and part of ION heaps that
is mapped into user space.
Bug: 138148041
Test: dumpsys meminfo
Change-Id: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-12-19 15:27:05 +00:00
Artur Satayev
50aa67dff1
Merge "Use new UnsupportedAppUsage annotation."
2019-12-19 13:43:58 +00:00
Automerger Merge Worker
c6b17a06cd
Merge "Do not call to SecureElement Service if device does not support any OMAPI readers" am: 98a96a40c6 am: 4d7d5c2c24 am: 420f048022
...
Change-Id: I325f8910c33bc7994a12a7ac0851df2f7109ef38
2019-12-19 12:40:51 +00:00
Automerger Merge Worker
420f048022
Merge "Do not call to SecureElement Service if device does not support any OMAPI readers" am: 98a96a40c6 am: 4d7d5c2c24
...
Change-Id: Ia5c252c4a7a52cdbb4e751076e1de6e924d07dff
2019-12-19 12:17:37 +00:00
Jack Yu
4d7d5c2c24
Merge "Do not call to SecureElement Service if device does not support any OMAPI readers"
...
am: 98a96a40c6
Change-Id: I94d624418afcf27a4c3fad02d19f94c5da7d6123
2019-12-19 04:03:10 -08:00
Treehugger Robot
98a96a40c6
Merge "Do not call to SecureElement Service if device does not support any OMAPI readers"
2019-12-19 11:29:08 +00:00
Automerger Merge Worker
6366a55ac8
Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev am: e0f4421f23
...
Change-Id: I297d79d8f5262e68df0c294c938646a0acacbce8
2019-12-19 10:45:31 +00:00
Felka Chang
ca1231035c
Fix build fail in java 8
...
Java 8 doesn't accept '<>' with anonymous inner classes
is not supported in -source 8
Test: manual build
Fix: 146539712
Change-Id: I8fa4bf80366e202a30b7108932abec0d76548ca9
2019-12-19 17:22:36 +08:00
TreeHugger Robot
85d68cd334
Merge "Remove default Device Owner restrictions"
2019-12-19 08:42:30 +00:00
Automerger Merge Worker
35990bba96
Merge "Add LinkProperties methods to system APIs" am: 4dba00e007 am: 8d2b81869c am: ae6c84fcb2
...
Change-Id: I39e9224206a43a85fecaf0956003cd4896ca0820
2019-12-19 08:38:26 +00:00
Automerger Merge Worker
ae6c84fcb2
Merge "Add LinkProperties methods to system APIs" am: 4dba00e007 am: 8d2b81869c
...
Change-Id: Ie0a102ceb853c9f61d3e1deb369938a48edcdcac
2019-12-19 08:22:11 +00:00
Aaron Huang
8d2b81869c
Merge "Add LinkProperties methods to system APIs"
...
am: 4dba00e007
Change-Id: Ib6cc8dff09ed97bdcf8504f8318461e742c34f7a
2019-12-19 00:06:31 -08:00
TreeHugger Robot
f0862553d7
Merge "Use new UnsupportedAppUsage annotation."
2019-12-19 08:04:35 +00:00
Mathew Inwood
03f4dc0a4b
Merge "Use new UnsupportedAppUsage annotation."
2019-12-19 08:02:31 +00:00
Aaron Huang
4dba00e007
Merge "Add LinkProperties methods to system APIs"
2019-12-19 08:01:58 +00:00
TreeHugger Robot
e0f4421f23
Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev
2019-12-19 07:49:32 +00:00
TreeHugger Robot
87bb84da38
Merge "Add query functionalities to query all of crates"
2019-12-19 07:16:37 +00:00
Automerger Merge Worker
1f5d183def
Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27 am: d23e6f7b09
...
Change-Id: I3d0f27c2ca0471af8058b86a7d1510cd246fda87
2019-12-19 06:38:58 +00:00
Automerger Merge Worker
d23e6f7b09
Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27
...
Change-Id: I7a5b775b93ce3c345d376b4c2e9dfa6ebde31848
2019-12-19 06:22:00 +00:00
Suren Baghdasaryan
215e1d5e27
Merge "Include KReclaimable meminfo field into getMemInfo results"
...
am: f61d2347c0
Change-Id: I9ee7de7b744100409475e7401a6ddede1c1cdbad
2019-12-18 22:03:31 -08:00
Suren Baghdasaryan
f61d2347c0
Merge "Include KReclaimable meminfo field into getMemInfo results"
2019-12-19 05:25:38 +00:00
Automerger Merge Worker
bed24cb825
Merge "Fix parceling of LinkProperties Inet6Addr" am: 7382f03d58 am: 50fb44e776 am: 091f1d790c
...
Change-Id: I6692a91c3e00fb8726ed4914f7d7e3c22874a068
2019-12-19 03:46:11 +00:00
Shuzhen Wang
f8aca7b463
Merge "Camera: Add support for CONTROL_ZOOM_RATIO"
2019-12-19 03:32:59 +00:00
Automerger Merge Worker
091f1d790c
Merge "Fix parceling of LinkProperties Inet6Addr" am: 7382f03d58 am: 50fb44e776
...
Change-Id: Ie5b7782d788717dd1cc440e502d6cdf2d1c18eaa
2019-12-19 03:29:50 +00:00
Remi NGUYEN VAN
50fb44e776
Merge "Fix parceling of LinkProperties Inet6Addr"
...
am: 7382f03d58
Change-Id: I7e4de0ecf06d34f050a881250755c8c0456269fc
2019-12-18 19:12:04 -08:00
Remi NGUYEN VAN
7382f03d58
Merge "Fix parceling of LinkProperties Inet6Addr"
2019-12-19 03:07:43 +00:00
Automerger Merge Worker
7b1b93935e
DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip am: c5dffc9a4a
...
Change-Id: I71f241c27feff278d71b4d70751ce94378eb37a6
2019-12-19 03:02:24 +00:00
TreeHugger Robot
86c09b2ddc
Merge changes I4af73809,Iba6a564a
...
* changes:
Hide com.android.server package with @hide javadoc tag
Add more enums for the client and process attributes of SystemApi
2019-12-19 02:46:17 +00:00
Dan Sandler
c5dffc9a4a
DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip
...
meta-data bundle keys (values are resids):
CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label"
CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon"
Test: manual, confirm that correct name & icon are used
and that custom icon is tinted in light/dark theme
(and that the copy chip is tinted right, too!)
Bug: 144290152
Change-Id: I57157e07630fa8bec3057e6d18336c59944fcb4f
2019-12-19 01:43:51 +00:00
TreeHugger Robot
848cc35375
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
2019-12-19 01:05:22 +00:00
Jeff Sharkey
19491026ca
We can't be as clever as we'd like.
...
We had hoped that SQLiteQueryBuilder could enforce some pretty strict
grammar rules, but there are apps depending on the full quirkiness
of what SQLite will allow, which is pretty much "expr" everywhere.
So we shift our strategy from a whitelist-style approach to a
blacklist-style one, where we're willing to let any valid keyword
be used _except_ for ones we know are rooted in abuse, such as
performing SELECT subqueries or relying on SQL injection to blur
the lines between well-defined clauses.
Bug: 146478800, 146482076
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ib57ceab0e229e01177cabd8277f3c989c817b10c
2019-12-18 17:55:42 -07:00
Jiyong Park
88d5e494c4
Add more enums for the client and process attributes of SystemApi
...
For the client attribute, we have
- MODULE_APPS for representing APKs implementing modules which are
considered part of the platform
- MODULE_LIBRARIES for representing jars inside modules.
For the process attribute, we have
- SYSTEM_SERVER for representing the system_server process.
For example, @SystemApi(client=MODULE_LIBRARIES,process=ALL) actually
means that the API is meant to be available for classes in the
bootclasspath but not to the classes from the app classloader.
Bug: 140202860
Test: m
Change-Id: Iba6a564a0967e4d109164849ee6d6500d46469de
2019-12-19 09:49:18 +09:00
Yifan Hong
12ebf362b4
Delete VINTF compatibility checks during OTA.
...
Such checks uses old libvintf to parse new VINTF metadata, which is not
supported. The check is now moved to OTA package build time, so there is
no need to check it on the device.
Test: builds
Bug: 139300422
Change-Id: Ifaec06b5298f698958e5727316bf661d1960d0aa
2019-12-18 16:30:07 -08:00