Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
432,360 Commits 3 Branches 0 Tags
1080bcbc06d62f6f0864f4eca231d0c54d3373fa
Commit Graph

11623 Commits

Author SHA1 Message Date
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
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
f4cbf933b7 Revert "Tweak RuntimeInit docs around MimeMap registration." 
am: 89bcfa5a21

Change-Id: I0ded17aa79749bd189f9149563787d9f56f7bf20
 2019-08-29 03:24:59 -07: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
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
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
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
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
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
f4c7bf02e4 Skip using the AppPredictionService if the component is not available 
am: a1c18a81af

Change-Id: I8ca1aaf0b36ee04b7b63a5d04b3fae460e7c554b
 2019-08-16 18:50:22 -07:00
Mehdi Alizadeh
a1c18a81af Skip using the AppPredictionService if the component is not available 
This CL adds a safeguard in ShareSheet to avoid calls to
AppPredictionService when the service is defined but is not available,
for example in the case of a wrong AiAi apk pushed from GooglePlay.

Bug: 138595943
Test: Manual test by removing the AiAi package from device

Change-Id: I4109c5122faa753d5111ee45698301cb6ccdd7b5
 2019-08-16 23:57:46 +00:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master 
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
 2019-08-14 12:04:06 -07:00
Rajeev Kumar
a9ba0f30ca Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3cc1 am: f9e3e40676 am: 2123aad7ab 
am: df003a7ba1

Change-Id: I463fa34afc551e61b7367525acc1a180d0d7376b
 2019-08-08 09:56:34 -07:00
Rajeev Kumar
df003a7ba1 Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3cc1 am: f9e3e40676 
am: 2123aad7ab

Change-Id: I286356883be0a88252a4ca7468f2413c73df97c7
 2019-08-08 09:46:18 -07:00
Rajeev Kumar
2123aad7ab Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3cc1 
am: f9e3e40676

Change-Id: I6a7f6b2783441465bdc0a1331b4183b742d9523c
 2019-08-08 09:24:14 -07:00
Rajeev Kumar
f9e3e40676 Merge "Stop showing disclosure UI when isDisclosureEnabled is false." 
am: 6452cc3cc1

Change-Id: Ie616ed1e05c45a30b5ab20873fa07f963f0d3e49
 2019-08-08 09:13:56 -07:00
Rajeev Kumar
6452cc3cc1 Merge "Stop showing disclosure UI when isDisclosureEnabled is false." 2019-08-08 15:42:51 +00:00
Nicolas Geoffray
6e16874401 Merge "Notify the ART runtime when boot is complete." am: f83748ae28 am: 6b9ab57b2d am: ed22d5f05c 
am: 8f93d19459

Change-Id: Iddebb915552b39cfb4cbe59bb67eb1c2aae0c8ea
 2019-08-08 05:53:00 -07:00
Nicolas Geoffray
8f93d19459 Merge "Notify the ART runtime when boot is complete." am: f83748ae28 am: 6b9ab57b2d 
am: ed22d5f05c

Change-Id: I88c5ab8807446464854d59f95ffc2877fa6aa963
 2019-08-08 05:43:38 -07:00
Nicolas Geoffray
ed22d5f05c Merge "Notify the ART runtime when boot is complete." am: f83748ae28 
am: 6b9ab57b2d

Change-Id: I5466b6f73087c6dea67c9b7cfaa3bf55bacb8a23
 2019-08-08 05:32:55 -07:00
Nicolas Geoffray
6b9ab57b2d Merge "Notify the ART runtime when boot is complete." 
am: f83748ae28

Change-Id: Iea67d64570657173832ee0d61288dc97af11496b
 2019-08-08 05:11:55 -07:00
David Srbecky
6d0d7066cf Notify the ART runtime when boot is complete. 
Needed for jit-zygote performance improvements.

Test: device boots
Bug: 119800099
Change-Id: I1e46f49d94440384473430d8afebe29fbee9c68e
 2019-08-08 07:57:35 +00:00
Rajeev Kumar
cd497ef6f3 Stop showing disclosure UI when isDisclosureEnabled is false. 
Bug: 137395050
Change-Id: Ic7768f7d3306f5d9d5c5c988afda4e8710c4ccd0
Test: Manual tests
 2019-08-08 03:09:38 +00:00
Beth Thibodeau
d8c9f1a833 Merge "Stop timer when notification is not visible" into qt-r1-dev am: f7ad427d8b 
am: 84b999ccb1

Change-Id: I2ae849e3b8a5a449d380fc391841689a0438ddd7
 2019-08-06 13:38:28 -07:00
Beth Thibodeau
84b999ccb1 Merge "Stop timer when notification is not visible" into qt-r1-dev 
am: f7ad427d8b

Change-Id: I49db80e1342ed8e82a21246c2f3a5f195e249b1c
 2019-08-06 13:28:53 -07:00
Beth Thibodeau
3ea5a1fcbe Merge "Stop timer when notification is not visible" into qt-r1-dev 
am: f7ad427d8b

Change-Id: I601b736974dffc1a4f5b8ced66d1d97127a42541
 2019-08-06 13:28:50 -07:00
Beth Thibodeau
f7ad427d8b Merge "Stop timer when notification is not visible" into qt-r1-dev 2019-08-06 20:11:27 +00:00