Commit Graph

109763 Commits

Author SHA1 Message Date
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
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
Yinglei Wang
0d2e2c2be0 Merge "Fix setting state description of toggle button and switch" 2019-12-18 22:59:25 +00:00
Suren Baghdasaryan
5f8e17b3ef Include KReclaimable meminfo field into getMemInfo results
With new KReclaimable stat available in /proc/meminfo include it in
getMemInfo results so that it can be accounted in dumpsys meminfo reports.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: Id475fcc0a63c6fc12ea64e08cec5cd24c83848a5
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-12-18 14:55:41 -08:00
TreeHugger Robot
bce6abd2b7 Merge "Fix TaskDescription's copy method" 2019-12-18 22:26:49 +00:00
Songchun Fan
8d76b33e85 Merge "[incremental] change temp dir" 2019-12-18 21:56:47 +00:00
TreeHugger Robot
d8492dbfb2 Merge "Migrating Incremental* APIs to PackageManager APIs." 2019-12-18 21:38:46 +00:00
Mark Renouf
3095609f4e Merge "Expose snapshotTask for use in WindowManager" 2019-12-18 21:34:52 +00:00
Mehdi Alizadeh
c5e29907c4 Fix TaskDescription's copy method
copyFromPreserveHiddenFields should only copy hidden fields if the field
is set in the other TaskDescription.

Bug: 144348683
Test: atest FrameworksCoreTests:ActivityManagerTest

Change-Id: I8475e82b7aeb0b7fc6a8cc0de88b926a847c7ac2
2019-12-18 11:47:37 -08:00
Kevin Chyn
a04597b8c7 Merge "Deprecate ACTION_FINGERPRINT_ENROLL and add ACTION_BIOMETRIC_ENROLL" 2019-12-18 19:37:29 +00:00
Alex Buynytskyy
ea14d19106 Migrating Incremental* APIs to PackageManager APIs.
This is the first step, migrating java parts.
CleanSpec.mk added as a workaround for b/146502407

Test: builds and flashes
Bug: b/136132412

Change-Id: Id0a26aa011b555ea457b5aafe7f5789c36d25bcc
2019-12-18 19:13:39 +00:00
Mark Renouf
98ba8e6905 Expose snapshotTask for use in WindowManager
Exposes snapshotTask which will immediately take a task snapshot
instead of checking the cache. Also adds an overload which allows
specifying scaleRatio and pixelFormat

Change-Id: I0ee3d90ae0ff508e10a8b24bd47d593f28ab1ea8
2019-12-18 14:05:41 -05:00
Automerger Merge Worker
f0fcf8c85a Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150 am: 16257918c9
Change-Id: I23ca1a8ca61e62b20c5b5eff0c7e9ef10c2e6711
2019-12-18 18:37:18 +00:00
Songchun Fan
720a7816d0 [incremental] change temp dir
Due to permission constraints, use a new temp dir for holding temporary
Incremental files/dirs.

Test: manual
Change-Id: I46b9d608225ed7ae3ccc552c6c43157d6505a66c
2019-12-18 10:36:58 -08:00
Automerger Merge Worker
16257918c9 Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150
Change-Id: Ieec4a553744be7148938ee19cce23371597985e6
2019-12-18 18:35:59 +00:00
David Su
66b0e7d150 Merge "Fix android.util.CloseGuard sample usage"
am: 7381525076

Change-Id: I4e69d9638ca69be5896bfeb0c3d950d340294cb5
2019-12-18 10:26:02 -08:00
Jeffrey Huang
18e52123ce Merge "Create statsmanager service" 2019-12-18 18:20:25 +00:00
David Su
7381525076 Merge "Fix android.util.CloseGuard sample usage" 2019-12-18 18:19:58 +00:00
TreeHugger Robot
c396f752dc Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2019-12-18 16:42:43 +00:00
TreeHugger Robot
6d080ff13b Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2019-12-18 16:42:02 +00:00
Artur Satayev
c895b1b450 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I8789f8499d4dca08580672e9e45ed9a7026dd686
2019-12-18 16:37:37 +00:00
Artur Satayev
e23a0eb5ee Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I6ab53570aca580fbee1fcc927871caa09780f58f
2019-12-18 16:15:02 +00:00
Automerger Merge Worker
d7c79c3a2c Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev am: 0416784c2e
Change-Id: I094be054c2a0be923714cc2cee54a95aced84bf8
2019-12-18 16:01:15 +00:00