Commit Graph

11950 Commits

Author SHA1 Message Date
Aran Ink
fd2bfd34bf Allow insertion of images from IMEs into notification quick replies.
Test: Unit tests pass. Creating a Notification with the Notify app allows access to rich media insertion via gboard, and inserted images show up in the Notify app upon sending.

Bug: 137398133
Change-Id: I65218dfaa083f7c24512430e647d8ca79058dff9
2019-10-14 16:40:30 -04:00
Rubin Xu
6762470fc2 Merge "Make DPM.isActivePasswordSufficient() synchronous again" 2019-08-29 12:24:00 +00:00
Tobias Thierer
92d2e65f0f Merge changes from topic "bug136256059_revert" am: aff95e5e7c am: 2d7cc3acf3 am: 2cf0f7a6c3 am: 0e77247fee
am: 901f252e89

Change-Id: I89ff2c864f64f8f6498adcacba7eaed8026afcee
2019-08-29 04:14:19 -07:00
Tobias Thierer
419d70912f Revert "Tweak RuntimeInit docs around MimeMap registration." am: 89bcfa5a21 am: f4cbf933b7 am: aa9b7696d1 am: 1b41ce4701
am: 1080bcbc06

Change-Id: Iec378b5d1ab929bb892436f1f6f58c1c8fe43dd0
2019-08-29 04:14:10 -07:00
Tobias Thierer
901f252e89 Merge changes from topic "bug136256059_revert" am: aff95e5e7c am: 2d7cc3acf3 am: 2cf0f7a6c3
am: 0e77247fee

Change-Id: Iff8a4d3a293f0aa7414b69d57e9f6e216f9ff44f
2019-08-29 04:01:43 -07:00
Tobias Thierer
1080bcbc06 Revert "Tweak RuntimeInit docs around MimeMap registration." am: 89bcfa5a21 am: f4cbf933b7 am: aa9b7696d1
am: 1b41ce4701

Change-Id: I9eda7d07d5b51aefcff9f6ce798214993cac5976
2019-08-29 04:01:36 -07:00
Tobias Thierer
0e77247fee Merge changes from topic "bug136256059_revert" am: aff95e5e7c am: 2d7cc3acf3
am: 2cf0f7a6c3

Change-Id: I4d7290175f5f5b41909c5428b66439402f22d12b
2019-08-29 03:50:24 -07:00
Tobias Thierer
1b41ce4701 Revert "Tweak RuntimeInit docs around MimeMap registration." am: 89bcfa5a21 am: f4cbf933b7
am: aa9b7696d1

Change-Id: Ice18e8e9e599856e12406b1190250477e58507ab
2019-08-29 03:49:53 -07:00
Tobias Thierer
2d7cc3acf3 Merge changes from topic "bug136256059_revert"
am: aff95e5e7c

Change-Id: I7b1caa27badbe5f77a0c12704d0050a6c15eb178
2019-08-29 03:25:10 -07:00
Tobias Thierer
f4cbf933b7 Revert "Tweak RuntimeInit docs around MimeMap registration."
am: 89bcfa5a21

Change-Id: I0ded17aa79749bd189f9149563787d9f56f7bf20
2019-08-29 03:24:59 -07:00
Tobias Thierer
aff95e5e7c Merge changes from topic "bug136256059_revert"
* changes:
  Revert "Move default MimeMap implementation to frameworks."
  Revert "Tweak RuntimeInit docs around MimeMap registration."
2019-08-29 10:05:20 +00:00
Tobias Thierer
f83bd777f3 Revert "Move default MimeMap implementation to frameworks."
This reverts commit 53f15f39f8.

Reason for revert: Caused slower app startup (I don't know why).

Change-Id: Id9e3811078bc435073f42996767589a711172400
2019-08-28 22:43:33 +00:00
Tobias Thierer
89bcfa5a21 Revert "Tweak RuntimeInit docs around MimeMap registration."
This reverts commit 098a533e78.

Reason for revert: Base CL caused slower app startup (I don't know why).

Change-Id: Ib67852b900ff2baeb34f5d553fb0d233f5475888
2019-08-28 22:43:06 +00:00
Sehee Park
01addff1b8 Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb am: b849d1fe35 am: 1666fbe3e0 am: 822d3ea264
am: 2d7bbb4230

Change-Id: I84f21ab54cb9233f8ef9071f4a76a30b60bd1d31
2019-08-26 14:54:35 -07:00
Sehee Park
2d7bbb4230 Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb am: b849d1fe35 am: 1666fbe3e0
am: 822d3ea264

Change-Id: I508a3608dbd883dd915b40c49eea9f025f8f485e
2019-08-26 13:46:38 -07:00
Mathieu Chartier
5834544053 Merge "Add phenotype property for profiling system server" 2019-08-26 16:37:25 +00:00
Sehee Park
822d3ea264 Merge "Define TAG_SYSTEM_DNS" am: fdc37666cb am: b849d1fe35
am: 1666fbe3e0

Change-Id: I722a17e3ae9a102e4012d982d1482d5d77ee42c0
2019-08-25 20:33:42 -07:00
Sehee Park
b849d1fe35 Merge "Define TAG_SYSTEM_DNS"
am: fdc37666cb

Change-Id: I8509280254eb207fe0e97ac5fb74abe599f692e6
2019-08-25 20:07:04 -07:00
Treehugger Robot
fdc37666cb Merge "Define TAG_SYSTEM_DNS" 2019-08-26 02:57:06 +00:00
Anna Trostanetski
a6fe3996e1 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3 am: 884ef46cdc
am: 8649477e74

Change-Id: I1722a3c2fc9444b4e05932bb287d5ccd389f1493
2019-08-24 01:40:24 -07:00
Tobias Thierer
237f58d0d1 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a am: bc59f857aa
am: eb2a053326

Change-Id: Ib5ae1da4687531c71d24f2c9a1d0dba776ebd719
2019-08-24 01:37:23 -07:00
Tobias Thierer
89accb0841 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp
am: 867daa7d82

Change-Id: I8ff51aa59aeebda8d117e5142100b9b86ccbfac9
2019-08-24 01:14:13 -07:00
Xin Li
a770df1d2e DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I94fce9c5c0b35cbb88ee27fa4cd037927964d2cd
2019-08-24 05:22:23 +00:00
Anna Trostanetski
8649477e74 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3
am: 884ef46cdc

Change-Id: I11d25c6de70389b9f8fb74b914a247bca224e631
2019-08-23 22:04:54 -07:00
Tobias Thierer
eb2a053326 Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730 am: b0c5a7af5a
am: bc59f857aa

Change-Id: I09976c187805459c01101e2c8dd1b056fc2067a5
2019-08-23 22:04:24 -07:00
Tobias Thierer
011723e214 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387
am: 4999ce080d

Change-Id: Id03e7205f9f89ed34e53a4db7ff42f47138f1b48
2019-08-23 21:54:32 -07:00
Mathieu Chartier
7b31c74ddb Add phenotype property for profiling system server
Added the property profilesystemserver in the RUNTIME_NATIVE_BOOT
namespace. This property is overrides the system one if it is
present.

Bug: 138851258
Test: set the property manually and verify that system server is started
Test: with profiling

Change-Id: Ifd69530e52a717a381b3f91b15a74329614906f2
2019-08-23 09:50:00 -07:00
Rubin Xu
1985486fbf Make DPM.isActivePasswordSufficient() synchronous again
At the moment isActivePasswordSufficient() can return stale result
immediately after a password change since the latest password metrics
information is pushed from LSS to DPMS asynchronously (this is to
avoid deadlock between LSS and DPMS due to lock inversion). Fix this
by moving the password metrics ground truth to LSS, and make DPMS
query LSS about the password metrics when needed.

Bug: 37090873
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Test: atest com.android.server.locksettings
Test: atest DeviceAdminHostSideTestApi24#testResetPassword_nycRestrictions
Test: atest DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest
Test: atest MixedManagedProfileOwnerTest#testPasswordQualityWithoutSecureLockScreen
Test: atest MixedManagedProfileOwnerTest#testResetPasswordWithToken
Test: atest MixedManagedProfileOwnerTest#testPasswordSufficientInitially

Change-Id: Ib1d1716024b8a6a6554afdb4ee9824d457ed8308
2019-08-23 13:38:14 +01:00
Anna Trostanetski
884ef46cdc Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb
am: 20f25166c3

Change-Id: Icbdf02f150e14b4c63b24e70e72f0faf3946e130
2019-08-23 03:15:57 -07:00
Tobias Thierer
bc59f857aa Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730
am: b0c5a7af5a

Change-Id: Iaa0664ec6cf5f5f993d6cc5719120d7a9461037b
2019-08-23 03:15:04 -07:00
Anna Trostanetski
20f25166c3 Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2
am: 81af0fc8bb

Change-Id: I815189c133f274d1a754327807915a02e642a44b
2019-08-23 02:54:36 -07:00
Tobias Thierer
b0c5a7af5a Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c
am: 41438c3730

Change-Id: Id2c69ea4d9e0c75c871ab4ff3f7e609e4e2746cb
2019-08-23 02:53:18 -07:00
Tobias Thierer
4999ce080d Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc
am: 1b6d718387

Change-Id: I0deb1fa3af8baf73841322477b914f60abe7641f
2019-08-23 02:50:36 -07:00
Tobias Thierer
1b6d718387 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a
am: 3f1d5d92fc

Change-Id: Ie30ff146804d651ddf922ea790150fbd57a9281d
2019-08-23 02:33:50 -07:00
Anna Trostanetski
81af0fc8bb Merge "Rename android.compat.IPlatformCompat"
am: ee716a23a2

Change-Id: I88fd93b46bcaa5ed782c407f2a9e9469fb0f5f0e
2019-08-23 02:26:15 -07:00
Tobias Thierer
41438c3730 Merge "Tweak RuntimeInit docs around MimeMap registration."
am: bc6371727c

Change-Id: I4c3cee161fec5f8065e4ea77f1bf5aa694909874
2019-08-23 02:25:10 -07:00
Tobias Thierer
3f1d5d92fc Merge "Move default MimeMap implementation to frameworks."
am: 19c3bdc88a

Change-Id: I4bb456d64ad27dabb7db920d6e40dd32c92af900
2019-08-23 02:13:28 -07:00
Anna Trostanetski
ee716a23a2 Merge "Rename android.compat.IPlatformCompat" 2019-08-21 19:46:39 +00:00
Treehugger Robot
bc6371727c Merge "Tweak RuntimeInit docs around MimeMap registration." 2019-08-21 18:38:41 +00:00
Treehugger Robot
19c3bdc88a Merge "Move default MimeMap implementation to frameworks." 2019-08-21 16:39:33 +00:00
atrost
a6a4d60ae0 Rename android.compat.IPlatformCompat
To com.android.internal.compat.IPlatformCompat. This solves a java9
issue because libcore exported api has the same package android.compat.

Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make framework
Change-Id: I0918344f670669cecb04f1e9e54dbcb471b587d5
2019-08-21 17:07:11 +01:00
Tobias Thierer
098a533e78 Tweak RuntimeInit docs around MimeMap registration.
Bug: 136256059
Test: Treehugger

Change-Id: I3f82a1684f47d96630badef4c13b3f507f30eaa5
2019-08-21 16:55:48 +01:00
Tobias Thierer
53f15f39f8 Move default MimeMap implementation to frameworks.
This CL topic moves the default MimeMap implementation to frameworks.
Libcore starts with a minimal implementation sufficient to pass
CtsLibcoreTestCases,  but frameworks can inject the real implementation.
Before this CL topic, the data files and logic (MimeMapImpl) were part of
core-*.jar on device; after this CL, they instead live in framework.jar.

Tests from MimeMapTest that check behavior of that default
implementation also move to a non-libcore CTS test.

Specifically, the logic and android.mime.types now live in
frameworks/base/mime. The default implementation is injected
into libcore from RuntimeInit. I chose to use a separate directory
(frameworks/base/mime/) and build java_library target ("mimemap")
in order to keep this as separate as possible from the rest of
frameworks code, to make it as easy as possible to factor this
out into a separate APEX module if we ever choose to do so.

Planned work for follow-up CL:
 1. Make CTS more opinionated, with a plan to assert that all of
    the default mappings are present. How exactly the expectated
    mapping will be bundled in CTS is still TBD.
 2. Add a vendor.mime.types file (defaults to empty) where vendors
    can add additional mappings; I plan to make it such that mappings
    in that file are parsed last but never override any earlier
    mappings, as if each mime type / file extension was prefixed
    with '?'.
 3. Perhaps enforce that public APIs android.webkit.MimeTypeMap
    and java.net.URLConnection.getFileNameMap() behave consistently
    with MimeMap.getDefault().

Test: atest CtsLibcoreTestCases
Test: atest CtsMimeMapTestCases
Bug: 136256059
Change-Id: Ib955699694d24a25c33ef2445443afb7c35ed9e7
2019-08-21 14:46:50 +01:00
zhuguangqing
52448a2242 Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e am: 6ccd3310db am: 2fc30b6e6e
am: cc437bf66f

Change-Id: I8f0a725630b9f79d3c91245b91fd630b2668dd58
2019-08-20 19:35:53 -07:00
zhuguangqing
cc437bf66f Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e am: 6ccd3310db
am: 2fc30b6e6e

Change-Id: Ibc88f31f1cee5c78f4b7ed8f6a3b03df9dc56ad8
2019-08-20 19:10:45 -07:00
zhuguangqing
2fc30b6e6e Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383 am: 8d8d85b93e
am: 6ccd3310db

Change-Id: Iba10dc657081b184f14e21f8a2a0e86fb9146faa
2019-08-20 19:00:40 -07:00
zhuguangqing
6ccd3310db Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383
am: 8d8d85b93e

Change-Id: Iec45a370c282d9622408a825cb11530e755a210f
2019-08-20 18:45:34 -07:00
zhuguangqing
8d8d85b93e Merge "Modify start/stop condition for mScreenDozeTimer."
am: 83ed488383

Change-Id: I12ff8f6860a60519a9b029010fa1078d47ccfc25
2019-08-20 18:22:19 -07:00
Treehugger Robot
83ed488383 Merge "Modify start/stop condition for mScreenDozeTimer." 2019-08-21 00:44:40 +00:00
Mehdi Alizadeh
0635808404 Skip using the AppPredictionService if the component is not available am: a1c18a81af
am: f4c7bf02e4

Change-Id: I082e8c3b8aa6d7ef134de4ac54caa54f9b7a832b
2019-08-16 18:59:17 -07:00