Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
381,132 Commits 3 Branches 0 Tags
51beefd255cbe09116e06c89406ffefbc8fd79bd
Commit Graph

381132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Brazdil
51beefd255 Merge "Revert "[framework] Compile secondary dex files in isolation"" am: 2c0278d35f 
am: 37e38790d6

Change-Id: I521d14015c2367fad26c5167b80e2ff53a3e8b8a
 2018-12-20 00:47:37 -08:00
David Brazdil
37e38790d6 Merge "Revert "[framework] Compile secondary dex files in isolation"" 
am: 2c0278d35f

Change-Id: I038f2b273aa5767e22995782ff939fe89f91e89d
 2018-12-20 00:38:29 -08:00
David Brazdil
2c0278d35f Merge "Revert "[framework] Compile secondary dex files in isolation"" 2018-12-20 08:25:22 +00:00
David Brazdil
22217f6a51 Revert "[framework] Compile secondary dex files in isolation" 
This reverts commit 8a5a708df1.
ART does not compile secondary dex files in the user process
any more. The original issue of a large overhead of providing
a class loader context is therefore not relevant any more and
we can start passing the context to installd.

Note that this also partially reverts commit
6dba50d633 which restricted
visibility of methods in PackageDexUsage. The commit also
removed data collection for unsupported class loaders. The
logic in PackageDexOptimizer was adjusted accordingly.

Bug: 64530081
Bug: 111174995
Test: manual
Change-Id: Id78b5a6d8841b199c12a63a8d45d12efbcc32275
 2018-12-20 08:24:56 +00:00
Mathew Inwood
41e0ce14be Merge "Include annotation property values in output." am: 989e767e84 
am: d12d0a1939

Change-Id: Ie32eb0da2c7d21aa8560362ee4a90768cee0e6a9
 2018-12-20 00:11:49 -08:00
Mathew Inwood
d12d0a1939 Merge "Include annotation property values in output." 
am: 989e767e84

Change-Id: I9bf520dd5e95438f308bdae9e0ff0e2006410741
 2018-12-19 23:56:05 -08:00
Mathew Inwood
989e767e84 Merge "Include annotation property values in output." 2018-12-20 07:48:25 +00:00
Mathew Inwood
cfc7952cc8 Include annotation property values in output. 
When editing annotations, we want the ability *not* to overwrite any
existing annotation properties already in place. Include any properties
set on the annotation in the output, so that the edit_annotations script
can know that they're there.

The annotation properties are encoded like URL query parameters for
convenience; it makes them easy to encode here & subsequently decode on
the other side (in Python).

Test: m framework-annotation-proc & inspect output.

(cherry picked from commit bd7077065c)

Merged-In: I71fb1215ad2790751be336b4955c163bb323a4a6
Change-Id: I0b33e2b379076346ce258d93a9225a9143b7d91a
 2018-12-20 07:47:29 +00:00
Chen Xu
9a8b822096 Merge "refactor dataFailCause" am: 9371864133 
am: ab7ada8060

Change-Id: I33f628f04da1402fe402c5234a78d4cf9d436d00
 2018-12-19 23:26:59 -08:00
Chen Xu
ab7ada8060 Merge "refactor dataFailCause" 
am: 9371864133

Change-Id: I95b86281f9e23874a819646f2c90b1609c720e00
 2018-12-19 23:17:46 -08:00
Chen Xu
9371864133 Merge "refactor dataFailCause" 2018-12-20 07:06:58 +00:00
chen xu
5e499effba refactor dataFailCause 
1. add comments for each data fail cause.
2. refactor dataFailCause from enum to int

Bug: 119891533
Test: Build & unit test
Change-Id: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
(cherry picked from commit 3016167192)
Merged-in: Ic453f80a3d0ccd22c6c4c1f4b2c90e2bf40cfbe1
 2018-12-19 21:59:50 -08:00
Hall Liu
372277f219 Merge changes from topics "dialer-account-suggestion-3", "dialer-account-suggestion-2" am: db5b77c275 
am: 5bf7e2cc5c

Change-Id: Ib9b33541a9679a6001fbeacb23d687cfb1a0740a
 2018-12-19 14:23:54 -08:00
Hall Liu
08fd16b47c Add the PhoneAccountSuggestionService am: c47570d5d0 
am: df448f5ea2

Change-Id: I7555d7dfbbf25fc35549d1a7cb29bbe3a83bebde
 2018-12-19 14:18:47 -08:00
Hall Liu
5bf7e2cc5c Merge changes from topics "dialer-account-suggestion-3", "dialer-account-suggestion-2" 
am: db5b77c275

Change-Id: Idb4c45a15b082e72a161f2a70e8c1b75c1b369bd
 2018-12-19 14:04:38 -08:00
Hall Liu
df448f5ea2 Add the PhoneAccountSuggestionService 
am: c47570d5d0

Change-Id: Ia7823ff16f1684db71845cb9d92434c448290c9a
 2018-12-19 13:57:48 -08:00
Hall Liu
db5b77c275 Merge changes from topics "dialer-account-suggestion-3", "dialer-account-suggestion-2" 
* changes:
  Enable CTS testing for phone account suggestions
  Add the PhoneAccountSuggestionService
 2018-12-19 21:36:54 +00:00
Nathan Harold
8ef57c30f8 Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e 
am: bef297206b

Change-Id: I92f7ea6f56a62ff167a1a8710d42639a598a2bd2
 2018-12-19 11:24:45 -08:00
Nathan Harold
bef297206b Merge "Annotate getMobileNetworkOperator() as Nullable" 
am: 795641f25e

Change-Id: I19c339ed0844766dcb89244cd3e60d68a75d800e
 2018-12-19 11:12:24 -08:00
Nathan Harold
795641f25e Merge "Annotate getMobileNetworkOperator() as Nullable" 2018-12-19 18:49:56 +00:00
Nathan Harold
a6d51ea03e Merge "Annotate CallbackExecutor in requestCellInfoUpdate" am: ff9932a7aa 
am: 0e4586f47b

Change-Id: I0dfa32f5b988a55d01bda9295efab5ba27fbc0f6
 2018-12-19 10:48:23 -08:00
Nathan Harold
0e4586f47b Merge "Annotate CallbackExecutor in requestCellInfoUpdate" 
am: ff9932a7aa

Change-Id: I3523ef0d8b4c8b4a3bfedc6c220acae0599a62f0
 2018-12-19 10:36:58 -08:00
Chen Xu
eb04d15cd8 Merge "add carrierid in subscriptionInfo" am: dcab1747cf 
am: 0ee1e893ac

Change-Id: Ic0cbe9fd707d48d62b40ea6a03bcc55cd507ee71
 2018-12-19 10:34:28 -08:00
Nathan Harold
ff9932a7aa Merge "Annotate CallbackExecutor in requestCellInfoUpdate" 2018-12-19 18:26:37 +00:00
Chen Xu
0ee1e893ac Merge "add carrierid in subscriptionInfo" 
am: dcab1747cf

Change-Id: I629fb5e0cced6759778435f03a10c3a5cef385b1
 2018-12-19 10:20:06 -08:00
Chen Xu
dcab1747cf Merge "add carrierid in subscriptionInfo" 2018-12-19 18:12:27 +00:00
jiayanhong
9eb509c14e Merge "Fixed toString() printing error" am: 0e6e776270 
am: 6cdb4fde08

Change-Id: Ia28e56d8a6b76247d552bcdbf43ef71ac80e313e
 2018-12-19 10:06:58 -08:00
jiayanhong
6cdb4fde08 Merge "Fixed toString() printing error" 
am: 0e6e776270

Change-Id: Id0f5d70a4549480fbb192628ce41796e4da04ad7
 2018-12-19 09:54:46 -08:00
Treehugger Robot
0e6e776270 Merge "Fixed toString() printing error" 2018-12-19 17:39:58 +00:00
nchalko
7539d01915 Merge "Convert to ISO 639-2/B for menu language" am: 8e217ba958 
am: 1cf354ae98

Change-Id: I4ba5218468817eb3be39af8e2e5b995744e5f069
 2018-12-19 08:18:59 -08:00
nchalko
1cf354ae98 Merge "Convert to ISO 639-2/B for menu language" 
am: 8e217ba958

Change-Id: Iaea64c7fed62cfae3c5359ea062d6498c8b9dc14
 2018-12-19 08:08:51 -08:00
nchalko
8e217ba958 Merge "Convert to ISO 639-2/B for menu language" 2018-12-19 15:51:30 +00:00
Luke Huang
0c1ffb0f9b Merge "Following commit for asynchronous DNS query API" am: a89f04a742 
am: b010078e40

Change-Id: Ibf8d6ed7ff28ead8b9b7eb51db85ae8b9487066b
 2018-12-19 01:32:35 -08:00
Luke Huang
b010078e40 Merge "Following commit for asynchronous DNS query API" 
am: a89f04a742

Change-Id: Ie45d4c6337178d8912d2f41dc9023d71c004b100
 2018-12-19 01:17:05 -08:00
Nicolas Geoffray
955963c109 Merge "Use the boot class loader as parent of system server loader." am: 7baf5a8d73 
am: c2a38e56f3

Change-Id: I5b467cd965f89240910f6a286d723a50d621b81b
 2018-12-19 01:08:02 -08:00
Luke Huang
a89f04a742 Merge "Following commit for asynchronous DNS query API" 2018-12-19 09:07:46 +00:00
Nicolas Geoffray
c2a38e56f3 Merge "Use the boot class loader as parent of system server loader." 
am: 7baf5a8d73

Change-Id: Id67c494c59bc9e61f81406ac36d9c664adbf97b2
 2018-12-19 00:55:33 -08:00
Nicolas Geoffray
7baf5a8d73 Merge "Use the boot class loader as parent of system server loader." 2018-12-19 08:35:24 +00:00
chen xu
64e81db02f add carrierid in subscriptionInfo 
add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call

Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
(cherry picked from commit 0034bb393c)
Merged-in: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
 2018-12-18 23:21:57 -08:00
Chienyuan
4e0b70bd6f Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" am: 6227b441a0 
am: 082be76cd4

Change-Id: I38ac4a840430e6e33e4574cdacac20bc06687545
 2018-12-18 19:14:08 -08:00
Chienyuan
082be76cd4 Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" 
am: 6227b441a0

Change-Id: Ibc7628614537aea1dc8996200f6eb272f758f8a7
 2018-12-18 19:02:34 -08:00
Treehugger Robot
6227b441a0 Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" 2018-12-19 02:41:52 +00:00
Josh Hou
3a71f85085 Merge "Print carrier Id information in toString()" am: 843e387bb6 
am: 55b4b268f5

Change-Id: I2a9fa3332c842bda8856006c7963814838ae8544
 2018-12-18 17:52:06 -08:00
Josh Hou
55b4b268f5 Merge "Print carrier Id information in toString()" 
am: 843e387bb6

Change-Id: Iee39cd88b060a5bd2dcbfa4bc6c3b6e6dba8c62a
 2018-12-18 17:40:46 -08:00
Josh Hou
843e387bb6 Merge "Print carrier Id information in toString()" 2018-12-19 01:22:25 +00:00
Eric Holk
77e8678219 Merge "[view-compiler] DexBuilder: Add check-cast instruction" am: bce4bd1745 
am: 758823ae17

Change-Id: I12ce815eb4f83c6abc60ad7402c754e3c69cb0d9
 2018-12-18 16:14:25 -08:00
Eric Holk
758823ae17 Merge "[view-compiler] DexBuilder: Add check-cast instruction" 
am: bce4bd1745

Change-Id: If8acd8f77f4eb54b0efacabaff8a09bee9ce3bb9
 2018-12-18 15:46:05 -08:00
Treehugger Robot
bce4bd1745 Merge "[view-compiler] DexBuilder: Add check-cast instruction" 2018-12-18 23:27:46 +00:00
Nathan Harold
6655dddcd5 Annotate CallbackExecutor in requestCellInfoUpdate 
Add a missing annotation for CallbackExecutor in
requestCellInfoUpdate().

Bug: 120489428
Test: compilation (no functional change)
Change-Id: I33bba9eb59f81aaefa0194b58936d4f809a8d51f
 2018-12-18 15:09:28 -08:00
Nathan Harold
13d6b11987 Annotate getMobileNetworkOperator() as Nullable 
Add Nullable annotations for the classes that support
getMobileNetworkOperator().

Bug: 118675404
Test: compilation (no functional change)
Change-Id: I914ec8242aff2f578dfe1f97f2e7cfe2d109c7dc
 2018-12-18 13:41:25 -08:00